|
@ -870,19 +870,19 @@ namespace ExtUI { |
|
|
const feedRate_t old_feedrate = feedrate_mm_s; |
|
|
const feedRate_t old_feedrate = feedrate_mm_s; |
|
|
const float x_target = MESH_MIN_X + pos.x * (MESH_X_DIST), |
|
|
const float x_target = MESH_MIN_X + pos.x * (MESH_X_DIST), |
|
|
y_target = MESH_MIN_Y + pos.y * (MESH_Y_DIST); |
|
|
y_target = MESH_MIN_Y + pos.y * (MESH_Y_DIST); |
|
|
if (x_target != current_position[X_AXIS] || y_target != current_position[Y_AXIS]) { |
|
|
if (x_target != current_position.x || y_target != current_position.y) { |
|
|
// If moving across bed, raise nozzle to safe height over bed
|
|
|
// If moving across bed, raise nozzle to safe height over bed
|
|
|
feedrate_mm_s = Z_PROBE_FEEDRATE_FAST; |
|
|
feedrate_mm_s = Z_PROBE_FEEDRATE_FAST; |
|
|
destination = current_position; |
|
|
destination = current_position; |
|
|
destination[Z_AXIS] = Z_CLEARANCE_BETWEEN_PROBES; |
|
|
destination.z = Z_CLEARANCE_BETWEEN_PROBES; |
|
|
prepare_line_to_destination(); |
|
|
prepare_line_to_destination(); |
|
|
feedrate_mm_s = XY_PROBE_FEEDRATE; |
|
|
feedrate_mm_s = XY_PROBE_FEEDRATE; |
|
|
destination[X_AXIS] = x_target; |
|
|
destination.x = x_target; |
|
|
destination[Y_AXIS] = y_target; |
|
|
destination.y = y_target; |
|
|
prepare_line_to_destination(); |
|
|
prepare_line_to_destination(); |
|
|
} |
|
|
} |
|
|
feedrate_mm_s = Z_PROBE_FEEDRATE_FAST; |
|
|
feedrate_mm_s = Z_PROBE_FEEDRATE_FAST; |
|
|
destination[Z_AXIS] = z; |
|
|
destination.z = z; |
|
|
prepare_line_to_destination(); |
|
|
prepare_line_to_destination(); |
|
|
feedrate_mm_s = old_feedrate; |
|
|
feedrate_mm_s = old_feedrate; |
|
|
#else |
|
|
#else |
|
|