Browse Source

For all probes, at the end of G29 simply raise and stow

Scott Lahteine 9 years ago
parent
commit
68e0e5855e
1 changed files with 5 additions and 8 deletions
  1. 5
    8
      Marlin/Marlin_main.cpp

+ 5
- 8
Marlin/Marlin_main.cpp View File

@@ -3788,17 +3788,14 @@ inline void gcode_G28() {
3788 3788
           if (DEBUGGING(LEVELING)) DEBUG_POS("> corrected Z in G29", current_position);
3789 3789
         #endif
3790 3790
       }
3791
+
3791 3792
     #endif // !DELTA
3792 3793
 
3793
-    #if DISABLED(Z_PROBE_ALLEN_KEY) && DISABLED(Z_PROBE_SLED) && !HAS_Z_SERVO_ENDSTOP
3794
-      raise_z_after_probing();
3795
-    #endif
3794
+    // Final raise of Z axis after probing.
3795
+    raise_z_after_probing();
3796 3796
 
3797
-    #if ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED) || ENABLED(MECHANICAL_PROBE)
3798
-      stow_z_probe();
3799
-    #else
3800
-      endstops.enable_z_probe(false);
3801
-    #endif
3797
+    // Stow the probe. Servo will raise if needed.
3798
+    stow_z_probe();
3802 3799
 
3803 3800
     #ifdef Z_PROBE_END_SCRIPT
3804 3801
       #if ENABLED(DEBUG_LEVELING_FEATURE)

Loading…
Cancel
Save