Browse Source

Move Z up before, or down after XY, for "blocking move"

pull/1/head
Scott Lahteine 8 years ago
parent
commit
6803c8e37e
  1. 19
      Marlin/Marlin_main.cpp

19
Marlin/Marlin_main.cpp

@ -1666,18 +1666,25 @@ static void clean_up_after_endstop_or_probe_move() {
#else
feedrate = homing_feedrate[Z_AXIS];
current_position[Z_AXIS] = z;
line_to_current_position();
stepper.synchronize();
// If Z needs to raise, do it before moving XY
if (current_position[Z_AXIS] < z) {
feedrate = homing_feedrate[Z_AXIS];
current_position[Z_AXIS] = z;
line_to_current_position();
}
feedrate = XY_PROBE_FEEDRATE;
current_position[X_AXIS] = x;
current_position[Y_AXIS] = y;
line_to_current_position();
// If Z needs to lower, do it after moving XY
if (current_position[Z_AXIS] > z) {
feedrate = homing_feedrate[Z_AXIS];
current_position[Z_AXIS] = z;
line_to_current_position();
}
#endif
stepper.synchronize();

Loading…
Cancel
Save