sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🚸 BLTouch extra clearance for PROBE_PT_RAISE

Browse Source
This commit is contained in:
Scott Lahteine
2023-04-11 18:18:37 -05:00
parent b3a3cf28d2
commit b1537135e4
1 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
Marlin/src/module/probe.cpp
View File

@@ -943,45 +943,45 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
do_blocking_move_to(npos, feedRate_t(XY_PROBE_FEEDRATE_MM_S)); do_blocking_move_to(npos, feedRate_t(XY_PROBE_FEEDRATE_MM_S));
#if ENABLED(BD_SENSOR) #if ENABLED(BD_SENSOR)
return current_position.z - bdl.read(); // Difference between Z-home-relative Z and sensor reading return current_position.z - bdl.read(); // Difference between Z-home-relative Z and sensor reading
#endif
float measured_z = NAN; #else // !BD_SENSOR
if (!deploy()) {
measured_z = run_z_probe(sanity_check) + offset.z;
TERN_(HAS_PTC, ptc.apply_compensation(measured_z));
TERN_(X_AXIS_TWIST_COMPENSATION, measured_z += xatc.compensation(npos + offset_xy));
}
// Deploy succeeded and a successful measurement was done. float measured_z = deploy() ? NAN : run_z_probe(sanity_check) + offset.z;
// Raise and/or stow the probe depending on 'raise_after' and settings.
if (!isnan(measured_z)) { // Deploy succeeded and a successful measurement was done.
const ProbePtRaise raise_type = (TERN0(BLTOUCH, !bltouch.high_speed_mode) && raise_after == PROBE_PT_RAISE) ? PROBE_PT_STOW : raise_after; // Raise and/or stow the probe depending on 'raise_after' and settings.
switch (raise_type) { if (!isnan(measured_z)) {
default: break; switch (raise_after) {
case PROBE_PT_RAISE: default: break;
do_z_clearance(Z_CLEARANCE_BETWEEN_PROBES); case PROBE_PT_RAISE:
break; do_z_clearance(Z_PROBE_SAFE_CLEARANCE);
case PROBE_PT_STOW: case PROBE_PT_LAST_STOW: break;
if (stow()) measured_z = NAN; // Error on stow? case PROBE_PT_STOW: case PROBE_PT_LAST_STOW:
break; if (stow()) measured_z = NAN; // Error on stow?
break;
}
} }
if (verbose_level > 2) // If any error occurred stow the probe and set an alert
SERIAL_ECHOLNPGM("Bed X: ", LOGICAL_X_POSITION(rx), " Y: ", LOGICAL_Y_POSITION(ry), " Z: ", measured_z); if (isnan(measured_z)) {
} stow();
LCD_MESSAGE(MSG_LCD_PROBING_FAILED);
#if DISABLED(G29_RETRY_AND_RECOVER)
SERIAL_ERROR_MSG(STR_ERR_PROBING_FAILED);
#endif
}
else {
TERN_(HAS_PTC, ptc.apply_compensation(measured_z));
TERN_(X_AXIS_TWIST_COMPENSATION, measured_z += xatc.compensation(npos + offset_xy));
if (verbose_level > 2 || DEBUGGING(LEVELING))
SERIAL_ECHOLNPGM("Bed X: ", LOGICAL_X_POSITION(rx), " Y: ", LOGICAL_Y_POSITION(ry), " Z: ", measured_z);
}
// If any error occurred stow the probe and set an alert return measured_z;
if (isnan(measured_z)) {
stow();
LCD_MESSAGE(MSG_LCD_PROBING_FAILED);
#if DISABLED(G29_RETRY_AND_RECOVER)
SERIAL_ERROR_MSG(STR_ERR_PROBING_FAILED);
#endif
}
DEBUG_ECHOLNPGM("measured_z: ", measured_z);
return measured_z; #endif // !BD_SENSOR
} }
#if HAS_Z_SERVO_PROBE #if HAS_Z_SERVO_PROBE