|
@ -376,13 +376,15 @@ FORCE_INLINE void probe_specific_action(const bool deploy) { |
|
|
|
|
|
|
|
|
dock_sled(!deploy); |
|
|
dock_sled(!deploy); |
|
|
|
|
|
|
|
|
#elif ENABLED(BLTOUCH) |
|
|
|
|
|
|
|
|
|
|
|
deploy ? bltouch.deploy() : bltouch.stow(); |
|
|
|
|
|
|
|
|
|
|
|
#elif HAS_Z_SERVO_PROBE |
|
|
#elif HAS_Z_SERVO_PROBE |
|
|
|
|
|
|
|
|
MOVE_SERVO(Z_PROBE_SERVO_NR, servo_angles[Z_PROBE_SERVO_NR][deploy ? 0 : 1]); |
|
|
#if DISABLED(BLTOUCH) |
|
|
|
|
|
MOVE_SERVO(Z_PROBE_SERVO_NR, servo_angles[Z_PROBE_SERVO_NR][deploy ? 0 : 1]); |
|
|
|
|
|
#elif ENABLED(BLTOUCH_HS_MODE) |
|
|
|
|
|
// In HIGH SPEED MODE, use the normal retractable probe logic in this code
|
|
|
|
|
|
// i.e. no intermediate STOWs and DEPLOYs in between individual probe actions
|
|
|
|
|
|
if (deploy) bltouch.deploy(); else bltouch.stow(); |
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
#elif EITHER(TOUCH_MI_PROBE, Z_PROBE_ALLEN_KEY) |
|
|
#elif EITHER(TOUCH_MI_PROBE, Z_PROBE_ALLEN_KEY) |
|
|
|
|
|
|
|
@ -445,12 +447,14 @@ bool set_probe_deployed(const bool deploy) { |
|
|
oldYpos = current_position[Y_AXIS]; |
|
|
oldYpos = current_position[Y_AXIS]; |
|
|
|
|
|
|
|
|
#if ENABLED(PROBE_TRIGGERED_WHEN_STOWED_TEST) |
|
|
#if ENABLED(PROBE_TRIGGERED_WHEN_STOWED_TEST) |
|
|
|
|
|
|
|
|
#if USES_Z_MIN_PROBE_ENDSTOP |
|
|
#if USES_Z_MIN_PROBE_ENDSTOP |
|
|
#define PROBE_STOWED() (READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING) |
|
|
#define PROBE_STOWED() (READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING) |
|
|
#else |
|
|
#else |
|
|
#define PROBE_STOWED() (READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING) |
|
|
#define PROBE_STOWED() (READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING) |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
#ifdef PROBE_STOWED |
|
|
|
|
|
|
|
|
// Only deploy/stow if needed
|
|
|
// Only deploy/stow if needed
|
|
|
if (PROBE_STOWED() == deploy) { |
|
|
if (PROBE_STOWED() == deploy) { |
|
|