|
|
@ -754,10 +754,8 @@ float Probe::probe_at_point(const float &rx, const float &ry, const ProbePtRaise
|
|
|
|
if (!deploy()) measured_z = run_z_probe() + offset.z;
|
|
|
|
if (!deploy()) measured_z = run_z_probe() + offset.z;
|
|
|
|
if (!isnan(measured_z)) {
|
|
|
|
if (!isnan(measured_z)) {
|
|
|
|
const bool big_raise = raise_after == PROBE_PT_BIG_RAISE;
|
|
|
|
const bool big_raise = raise_after == PROBE_PT_BIG_RAISE;
|
|
|
|
if (big_raise || raise_after == PROBE_PT_RAISE) {
|
|
|
|
if (big_raise || raise_after == PROBE_PT_RAISE)
|
|
|
|
if (current_position.z < Z_PROBE_OFFSET_RANGE_MAX) // Only raise when in probing range (else error)
|
|
|
|
|
|
|
|
do_blocking_move_to_z(current_position.z + (big_raise ? 25 : Z_CLEARANCE_BETWEEN_PROBES), MMM_TO_MMS(Z_PROBE_SPEED_FAST));
|
|
|
|
do_blocking_move_to_z(current_position.z + (big_raise ? 25 : Z_CLEARANCE_BETWEEN_PROBES), MMM_TO_MMS(Z_PROBE_SPEED_FAST));
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (raise_after == PROBE_PT_STOW)
|
|
|
|
else if (raise_after == PROBE_PT_STOW)
|
|
|
|
if (stow()) measured_z = NAN; // Error on stow?
|
|
|
|
if (stow()) measured_z = NAN; // Error on stow?
|
|
|
|
|
|
|
|
|
|
|
|