浏览代码

Fix modes ordering in prepare_move_to_destination_dualx

Scott Lahteine 8 年前
父节点
当前提交
053fb55af6
共有 1 个文件被更改,包括 17 次插入17 次删除
  1. 17
    17
      Marlin/Marlin_main.cpp

+ 17
- 17
Marlin/Marlin_main.cpp 查看文件

@@ -9223,23 +9223,6 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
9223 9223
       switch (dual_x_carriage_mode) {
9224 9224
         case DXC_FULL_CONTROL_MODE:
9225 9225
           break;
9226
-        case DXC_DUPLICATION_MODE:
9227
-          if (active_extruder == 0) {
9228
-            // move duplicate extruder into correct duplication position.
9229
-            planner.set_position_mm(
9230
-              LOGICAL_X_POSITION(inactive_extruder_x_pos),
9231
-              current_position[Y_AXIS],
9232
-              current_position[Z_AXIS],
9233
-              current_position[E_AXIS]
9234
-            );
9235
-            planner.buffer_line(current_position[X_AXIS] + duplicate_extruder_x_offset,
9236
-                             current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], planner.max_feedrate_mm_s[X_AXIS], 1);
9237
-            SYNC_PLAN_POSITION_KINEMATIC();
9238
-            stepper.synchronize();
9239
-            extruder_duplication_enabled = true;
9240
-            active_extruder_parked = false;
9241
-          }
9242
-          break;
9243 9226
         case DXC_AUTO_PARK_MODE:
9244 9227
           if (current_position[E_AXIS] == destination[E_AXIS]) {
9245 9228
             // This is a travel move (with no extrusion)
@@ -9259,6 +9242,23 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
9259 9242
           planner.buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], planner.max_feedrate_mm_s[Z_AXIS], active_extruder);
9260 9243
           active_extruder_parked = false;
9261 9244
           break;
9245
+        case DXC_DUPLICATION_MODE:
9246
+          if (active_extruder == 0) {
9247
+            // move duplicate extruder into correct duplication position.
9248
+            planner.set_position_mm(
9249
+              LOGICAL_X_POSITION(inactive_extruder_x_pos),
9250
+              current_position[Y_AXIS],
9251
+              current_position[Z_AXIS],
9252
+              current_position[E_AXIS]
9253
+            );
9254
+            planner.buffer_line(current_position[X_AXIS] + duplicate_extruder_x_offset,
9255
+                             current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], planner.max_feedrate_mm_s[X_AXIS], 1);
9256
+            SYNC_PLAN_POSITION_KINEMATIC();
9257
+            stepper.synchronize();
9258
+            extruder_duplication_enabled = true;
9259
+            active_extruder_parked = false;
9260
+          }
9261
+          break;
9262 9262
       }
9263 9263
     }
9264 9264
     return true;

正在加载...
取消
保存