Sfoglia il codice sorgente

Reapply BLTouch deploy/stow patch

- Fixes #14328
- Originally #14352
- Reverted in 2580104
Scott Lahteine 4 anni fa
parent
commit
f090a927f4
1 ha cambiato i file con 5 aggiunte e 7 eliminazioni
  1. 5
    7
      Marlin/src/module/probe.cpp

+ 5
- 7
Marlin/src/module/probe.cpp Vedi File

@@ -324,15 +324,13 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
324 324
 
325 325
     dock_sled(!deploy);
326 326
 
327
+  #elif ENABLED(BLTOUCH)
328
+
329
+    deploy ? bltouch.deploy() : bltouch.stow();
330
+
327 331
   #elif HAS_Z_SERVO_PROBE
328 332
 
329
-    #if DISABLED(BLTOUCH)
330
-      MOVE_SERVO(Z_PROBE_SERVO_NR, servo_angles[Z_PROBE_SERVO_NR][deploy ? 0 : 1]);
331
-    #elif ENABLED(BLTOUCH_HS_MODE)
332
-      // In HIGH SPEED MODE, use the normal retractable probe logic in this code
333
-      // i.e. no intermediate STOWs and DEPLOYs in between individual probe actions
334
-      if (deploy) bltouch.deploy(); else bltouch.stow();
335
-    #endif
333
+    MOVE_SERVO(Z_PROBE_SERVO_NR, servo_angles[Z_PROBE_SERVO_NR][deploy ? 0 : 1]);
336 334
 
337 335
   #elif EITHER(TOUCH_MI_PROBE, Z_PROBE_ALLEN_KEY)
338 336
 

Loading…
Annulla
Salva