Browse Source

Reduce code size for Dual X un-park

Scott Lahteine 8 years ago
parent
commit
54109dfaec
1 changed files with 10 additions and 4 deletions
  1. 10
    4
      Marlin/Marlin_main.cpp

+ 10
- 4
Marlin/Marlin_main.cpp View File

9233
               return false;
9233
               return false;
9234
             }
9234
             }
9235
           }
9235
           }
9236
-          delayed_move_time = 0;
9237
           // unpark extruder: 1) raise, 2) move into starting XY position, 3) lower
9236
           // unpark extruder: 1) raise, 2) move into starting XY position, 3) lower
9238
-          planner.buffer_line(raised_parked_position[X_AXIS], raised_parked_position[Y_AXIS], raised_parked_position[Z_AXIS], current_position[E_AXIS], planner.max_feedrate_mm_s[Z_AXIS], active_extruder);
9239
-          planner.buffer_line(current_position[X_AXIS], current_position[Y_AXIS], raised_parked_position[Z_AXIS], current_position[E_AXIS], PLANNER_XY_FEEDRATE(), active_extruder);
9240
-          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);
9237
+          for (uint8_t i = 0; i < 3; i++)
9238
+            planner.buffer_line(
9239
+              i == 0 ? raised_parked_position[X_AXIS] : current_position[X_AXIS],
9240
+              i == 0 ? raised_parked_position[Y_AXIS] : current_position[Y_AXIS],
9241
+              i == 2 ? current_position[Z_AXIS] : raised_parked_position[Z_AXIS],
9242
+              current_position[E_AXIS],
9243
+              i == 1 ? PLANNER_XY_FEEDRATE() : planner.max_feedrate_mm_s[Z_AXIS],
9244
+              active_extruder
9245
+            );
9246
+          delayed_move_time = 0;
9241
           active_extruder_parked = false;
9247
           active_extruder_parked = false;
9242
           break;
9248
           break;
9243
         case DXC_DUPLICATION_MODE:
9249
         case DXC_DUPLICATION_MODE:

Loading…
Cancel
Save