Bläddra i källkod

Allow Z_AFTER_PROBING to be 0

Scott Lahteine 6 år sedan
förälder
incheckning
59fda986ea

+ 1
- 1
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp Visa fil

@@ -756,7 +756,7 @@
756 756
 
757 757
       STOW_PROBE();
758 758
 
759
-      #if Z_AFTER_PROBING
759
+      #ifdef Z_AFTER_PROBING
760 760
         move_z_after_probing();
761 761
       #endif
762 762
 

+ 1
- 1
Marlin/src/gcode/bedlevel/abl/G29.cpp Visa fil

@@ -965,7 +965,7 @@ void GcodeSuite::G29() {
965 965
   if (planner.leveling_active)
966 966
     SYNC_PLAN_POSITION_KINEMATIC();
967 967
 
968
-  #if HAS_BED_PROBE && Z_AFTER_PROBING
968
+  #if HAS_BED_PROBE && defined(Z_AFTER_PROBING)
969 969
     move_z_after_probing();
970 970
   #endif
971 971
 

+ 1
- 1
Marlin/src/gcode/calibrate/G28.cpp Visa fil

@@ -312,7 +312,7 @@ void GcodeSuite::G28(const bool always_home_all) {
312 312
           HOMEAXIS(Z);
313 313
         #endif
314 314
 
315
-        #if HOMING_Z_WITH_PROBE && Z_AFTER_PROBING
315
+        #if HOMING_Z_WITH_PROBE && defined(Z_AFTER_PROBING)
316 316
           move_z_after_probing();
317 317
         #endif
318 318
 

+ 1
- 1
Marlin/src/gcode/probe/G30.cpp Visa fil

@@ -62,7 +62,7 @@ void GcodeSuite::G30() {
62 62
 
63 63
   clean_up_after_endstop_or_probe_move();
64 64
 
65
-  #if Z_AFTER_PROBING
65
+  #ifdef Z_AFTER_PROBING
66 66
     if (raise_after == PROBE_PT_STOW) move_z_after_probing();
67 67
   #endif
68 68
 

+ 1
- 1
Marlin/src/gcode/probe/M401_M402.cpp Visa fil

@@ -41,7 +41,7 @@ void GcodeSuite::M401() {
41 41
  */
42 42
 void GcodeSuite::M402() {
43 43
   STOW_PROBE();
44
-  #if Z_AFTER_PROBING
44
+  #ifdef Z_AFTER_PROBING
45 45
     move_z_after_probing();
46 46
   #endif
47 47
   report_current_position();

+ 1
- 1
Marlin/src/module/probe.cpp Visa fil

@@ -465,7 +465,7 @@ bool set_probe_deployed(const bool deploy) {
465 465
   return false;
466 466
 }
467 467
 
468
-#if Z_AFTER_PROBING
468
+#ifdef Z_AFTER_PROBING
469 469
   // After probing move to a preferred Z position
470 470
   void move_z_after_probing() {
471 471
     if (current_position[Z_AXIS] != Z_AFTER_PROBING) {

+ 1
- 1
Marlin/src/module/probe.h Visa fil

@@ -32,7 +32,7 @@
32 32
 #if HAS_BED_PROBE
33 33
   extern float zprobe_zoffset;
34 34
   bool set_probe_deployed(const bool deploy);
35
-  #if Z_AFTER_PROBING
35
+  #ifdef Z_AFTER_PROBING
36 36
     void move_z_after_probing();
37 37
   #endif
38 38
   enum ProbePtRaise : unsigned char {

Laddar…
Avbryt
Spara