|
@@ -376,15 +376,13 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
|
376
|
376
|
|
377
|
377
|
dock_sled(!deploy);
|
378
|
378
|
|
|
379
|
+ #elif ENABLED(BLTOUCH)
|
|
380
|
+
|
|
381
|
+ deploy ? bltouch.deploy() : bltouch.stow();
|
|
382
|
+
|
379
|
383
|
#elif HAS_Z_SERVO_PROBE
|
380
|
384
|
|
381
|
|
- #if DISABLED(BLTOUCH)
|
382
|
|
- MOVE_SERVO(Z_PROBE_SERVO_NR, servo_angles[Z_PROBE_SERVO_NR][deploy ? 0 : 1]);
|
383
|
|
- #elif ENABLED(BLTOUCH_HS_MODE)
|
384
|
|
- // In HIGH SPEED MODE, use the normal retractable probe logic in this code
|
385
|
|
- // i.e. no intermediate STOWs and DEPLOYs in between individual probe actions
|
386
|
|
- if (deploy) bltouch.deploy(); else bltouch.stow();
|
387
|
|
- #endif
|
|
385
|
+ MOVE_SERVO(Z_PROBE_SERVO_NR, servo_angles[Z_PROBE_SERVO_NR][deploy ? 0 : 1]);
|
388
|
386
|
|
389
|
387
|
#elif EITHER(TOUCH_MI_PROBE, Z_PROBE_ALLEN_KEY)
|
390
|
388
|
|
|
@@ -447,14 +445,12 @@ bool set_probe_deployed(const bool deploy) {
|
447
|
445
|
oldYpos = current_position[Y_AXIS];
|
448
|
446
|
|
449
|
447
|
#if ENABLED(PROBE_TRIGGERED_WHEN_STOWED_TEST)
|
|
448
|
+
|
450
|
449
|
#if USES_Z_MIN_PROBE_ENDSTOP
|
451
|
450
|
#define PROBE_STOWED() (READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING)
|
452
|
451
|
#else
|
453
|
452
|
#define PROBE_STOWED() (READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING)
|
454
|
453
|
#endif
|
455
|
|
- #endif
|
456
|
|
-
|
457
|
|
- #ifdef PROBE_STOWED
|
458
|
454
|
|
459
|
455
|
// Only deploy/stow if needed
|
460
|
456
|
if (PROBE_STOWED() == deploy) {
|
|
@@ -746,11 +742,7 @@ float probe_pt(const float &rx, const float &ry, const ProbePtRaise raise_after/
|
746
|
742
|
feedrate_mm_s = old_feedrate_mm_s;
|
747
|
743
|
|
748
|
744
|
if (isnan(measured_z)) {
|
749
|
|
- #if ENABLED(BLTOUCH) && DISABLED(BLTOUCH_HS_MODE)
|
750
|
|
- bltouch.stow();
|
751
|
|
- #else
|
752
|
|
- STOW_PROBE();
|
753
|
|
- #endif
|
|
745
|
+ STOW_PROBE();
|
754
|
746
|
LCD_MESSAGEPGM(MSG_ERR_PROBING_FAILED);
|
755
|
747
|
SERIAL_ERROR_MSG(MSG_ERR_PROBING_FAILED);
|
756
|
748
|
}
|