Browse Source

Allow Z_AFTER_PROBING to be 0

Scott Lahteine 7 years ago
parent
commit
59fda986ea

+ 1
- 1
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp View File

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

+ 1
- 1
Marlin/src/gcode/bedlevel/abl/G29.cpp View File

965
   if (planner.leveling_active)
965
   if (planner.leveling_active)
966
     SYNC_PLAN_POSITION_KINEMATIC();
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
     move_z_after_probing();
969
     move_z_after_probing();
970
   #endif
970
   #endif
971
 
971
 

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

312
           HOMEAXIS(Z);
312
           HOMEAXIS(Z);
313
         #endif
313
         #endif
314
 
314
 
315
-        #if HOMING_Z_WITH_PROBE && Z_AFTER_PROBING
315
+        #if HOMING_Z_WITH_PROBE && defined(Z_AFTER_PROBING)
316
           move_z_after_probing();
316
           move_z_after_probing();
317
         #endif
317
         #endif
318
 
318
 

+ 1
- 1
Marlin/src/gcode/probe/G30.cpp View File

62
 
62
 
63
   clean_up_after_endstop_or_probe_move();
63
   clean_up_after_endstop_or_probe_move();
64
 
64
 
65
-  #if Z_AFTER_PROBING
65
+  #ifdef Z_AFTER_PROBING
66
     if (raise_after == PROBE_PT_STOW) move_z_after_probing();
66
     if (raise_after == PROBE_PT_STOW) move_z_after_probing();
67
   #endif
67
   #endif
68
 
68
 

+ 1
- 1
Marlin/src/gcode/probe/M401_M402.cpp View File

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

+ 1
- 1
Marlin/src/module/probe.cpp View File

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

+ 1
- 1
Marlin/src/module/probe.h View File

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

Loading…
Cancel
Save