Browse Source

Fix BLTOUCH deploy/stow in HS mode (#14352)

BigIronGuru 6 years ago
parent
commit
8f99d45045
1 changed files with 7 additions and 15 deletions
  1. 7
    15
      Marlin/src/module/probe.cpp

+ 7
- 15
Marlin/src/module/probe.cpp View File

376
 
376
 
377
     dock_sled(!deploy);
377
     dock_sled(!deploy);
378
 
378
 
379
+  #elif ENABLED(BLTOUCH)
380
+
381
+    deploy ? bltouch.deploy() : bltouch.stow();
382
+
379
   #elif HAS_Z_SERVO_PROBE
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
   #elif EITHER(TOUCH_MI_PROBE, Z_PROBE_ALLEN_KEY)
387
   #elif EITHER(TOUCH_MI_PROBE, Z_PROBE_ALLEN_KEY)
390
 
388
 
447
               oldYpos = current_position[Y_AXIS];
445
               oldYpos = current_position[Y_AXIS];
448
 
446
 
449
   #if ENABLED(PROBE_TRIGGERED_WHEN_STOWED_TEST)
447
   #if ENABLED(PROBE_TRIGGERED_WHEN_STOWED_TEST)
448
+
450
     #if USES_Z_MIN_PROBE_ENDSTOP
449
     #if USES_Z_MIN_PROBE_ENDSTOP
451
       #define PROBE_STOWED() (READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING)
450
       #define PROBE_STOWED() (READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING)
452
     #else
451
     #else
453
       #define PROBE_STOWED() (READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING)
452
       #define PROBE_STOWED() (READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING)
454
     #endif
453
     #endif
455
-  #endif
456
-
457
-  #ifdef PROBE_STOWED
458
 
454
 
459
     // Only deploy/stow if needed
455
     // Only deploy/stow if needed
460
     if (PROBE_STOWED() == deploy) {
456
     if (PROBE_STOWED() == deploy) {
746
   feedrate_mm_s = old_feedrate_mm_s;
742
   feedrate_mm_s = old_feedrate_mm_s;
747
 
743
 
748
   if (isnan(measured_z)) {
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
     LCD_MESSAGEPGM(MSG_ERR_PROBING_FAILED);
746
     LCD_MESSAGEPGM(MSG_ERR_PROBING_FAILED);
755
     SERIAL_ERROR_MSG(MSG_ERR_PROBING_FAILED);
747
     SERIAL_ERROR_MSG(MSG_ERR_PROBING_FAILED);
756
   }
748
   }

Loading…
Cancel
Save