|
|
@ -152,8 +152,8 @@ xyz_pos_t Probe::offset; // Initialized by settings.load() |
|
|
|
inline void run_stow_moves_script() { |
|
|
|
const xyz_pos_t oldpos = current_position; |
|
|
|
endstops.enable_z_probe(false); |
|
|
|
do_blocking_move_to_z(TOUCH_MI_RETRACT_Z, MMM_TO_MMS(HOMING_FEEDRATE_Z)); |
|
|
|
do_blocking_move_to(oldpos, MMM_TO_MMS(HOMING_FEEDRATE_Z)); |
|
|
|
do_blocking_move_to_z(TOUCH_MI_RETRACT_Z, homing_feedrate(Z_AXIS)); |
|
|
|
do_blocking_move_to(oldpos, homing_feedrate(Z_AXIS)); |
|
|
|
} |
|
|
|
|
|
|
|
#elif ENABLED(Z_PROBE_ALLEN_KEY) |
|
|
@ -664,11 +664,8 @@ float Probe::probe_at_point(const float &rx, const float &ry, const ProbePtRaise |
|
|
|
} |
|
|
|
else if (!position_is_reachable(npos)) return NAN; // The given position is in terms of the nozzle
|
|
|
|
|
|
|
|
const float old_feedrate_mm_s = feedrate_mm_s; |
|
|
|
feedrate_mm_s = XY_PROBE_FEEDRATE_MM_S; |
|
|
|
|
|
|
|
// Move the probe to the starting XYZ
|
|
|
|
do_blocking_move_to(npos); |
|
|
|
do_blocking_move_to(npos, feedRate_t(XY_PROBE_FEEDRATE_MM_S)); |
|
|
|
|
|
|
|
float measured_z = NAN; |
|
|
|
if (!deploy()) measured_z = run_z_probe(sanity_check) + offset.z; |
|
|
@ -683,8 +680,6 @@ float Probe::probe_at_point(const float &rx, const float &ry, const ProbePtRaise |
|
|
|
SERIAL_ECHOLNPAIR("Bed X: ", LOGICAL_X_POSITION(rx), " Y: ", LOGICAL_Y_POSITION(ry), " Z: ", measured_z); |
|
|
|
} |
|
|
|
|
|
|
|
feedrate_mm_s = old_feedrate_mm_s; |
|
|
|
|
|
|
|
if (isnan(measured_z)) { |
|
|
|
stow(); |
|
|
|
LCD_MESSAGEPGM(MSG_LCD_PROBING_FAILED); |
|
|
|