From 68e0e5855eee065443fedd73c116a587167fd501 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 21 Jun 2016 15:11:56 -0700 Subject: [PATCH] For all probes, at the end of G29 simply raise and stow --- Marlin/Marlin_main.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index ba5513b78..fc500eb6c 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -3788,17 +3788,14 @@ inline void gcode_G28() { if (DEBUGGING(LEVELING)) DEBUG_POS("> corrected Z in G29", current_position); #endif } + #endif // !DELTA - #if DISABLED(Z_PROBE_ALLEN_KEY) && DISABLED(Z_PROBE_SLED) && !HAS_Z_SERVO_ENDSTOP - raise_z_after_probing(); - #endif + // Final raise of Z axis after probing. + raise_z_after_probing(); - #if ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED) || ENABLED(MECHANICAL_PROBE) - stow_z_probe(); - #else - endstops.enable_z_probe(false); - #endif + // Stow the probe. Servo will raise if needed. + stow_z_probe(); #ifdef Z_PROBE_END_SCRIPT #if ENABLED(DEBUG_LEVELING_FEATURE)