Browse Source

Fix G28 with non-BLTouch probes (#14381)

BigIronGuru 5 years ago
parent
commit
5986194c36
1 changed files with 4 additions and 7 deletions
  1. 4
    7
      Marlin/src/gcode/calibrate/G28.cpp

+ 4
- 7
Marlin/src/gcode/calibrate/G28.cpp View File

43
   #include "../../module/probe.h"
43
   #include "../../module/probe.h"
44
 #endif
44
 #endif
45
 
45
 
46
-#if ENABLED(BLTOUCH)
47
-  #include "../../feature/bltouch.h"
48
-#endif
49
-
50
 #include "../../lcd/ultralcd.h"
46
 #include "../../lcd/ultralcd.h"
51
 
47
 
52
 #if HAS_DRIVER(L6470)                         // set L6470 absolute position registers to counts
48
 #if HAS_DRIVER(L6470)                         // set L6470 absolute position registers to counts
266
 
262
 
267
     set_destination_from_current();
263
     set_destination_from_current();
268
 
264
 
265
+    #if HAS_BED_PROBE
266
+      STOW_PROBE();
267
+    #endif
268
+
269
     #if Z_HOME_DIR > 0  // If homing away from BED do Z first
269
     #if Z_HOME_DIR > 0  // If homing away from BED do Z first
270
 
270
 
271
       if (doZ) homeaxis(Z_AXIS);
271
       if (doZ) homeaxis(Z_AXIS);
345
     // Home Z last if homing towards the bed
345
     // Home Z last if homing towards the bed
346
     #if Z_HOME_DIR < 0
346
     #if Z_HOME_DIR < 0
347
       if (doZ) {
347
       if (doZ) {
348
-        #if ENABLED(BLTOUCH)
349
-          bltouch.init();
350
-        #endif
351
         #if ENABLED(Z_SAFE_HOMING)
348
         #if ENABLED(Z_SAFE_HOMING)
352
           home_z_safely();
349
           home_z_safely();
353
         #else
350
         #else

Loading…
Cancel
Save