From f090a927f4094f42efea3455314c46c9ff307a64 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 12 Apr 2020 15:16:04 -0500
Subject: [PATCH] Reapply BLTouch deploy/stow patch
- Fixes #14328
- Originally #14352
- Reverted in 2580104
---
Marlin/src/module/probe.cpp | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 6e3f2baa66..b4912d30c4 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -324,15 +324,13 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
dock_sled(!deploy);
+ #elif ENABLED(BLTOUCH)
+
+ deploy ? bltouch.deploy() : bltouch.stow();
+
#elif HAS_Z_SERVO_PROBE
- #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
+ MOVE_SERVO(Z_PROBE_SERVO_NR, servo_angles[Z_PROBE_SERVO_NR][deploy ? 0 : 1]);
#elif EITHER(TOUCH_MI_PROBE, Z_PROBE_ALLEN_KEY)
--
GitLab