From 37799f70ba078a209ff436e47b2a8be20439c7da Mon Sep 17 00:00:00 2001 From: Charles Bell Date: Thu, 4 Sep 2014 14:36:39 -0400 Subject: [PATCH 1/2] Corrected retract() call for use of auto probe without sled enabled. --- Marlin/Marlin_main.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index b42cb952a2..957e24ca9e 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -1136,8 +1136,10 @@ static void homeaxis(int axis) { } #endif #if defined (ENABLE_AUTO_BED_LEVELING) && (PROBE_SERVO_DEACTIVATION_DELAY > 0) -// if (axis==Z_AXIS) retract_z_probe(); -#endif + #ifndef Z_PROBE_SLED + if (axis==Z_AXIS) retract_z_probe(); + #endif# +endif } } From 3b8216bdd110fdae6894b75b0380f6b19fbd7cbd Mon Sep 17 00:00:00 2001 From: Charles Bell Date: Thu, 4 Sep 2014 16:40:22 -0400 Subject: [PATCH 2/2] Corrected #endif and ifdef for Z_PROBE_SLED code. --- Marlin/Marlin_main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 957e24ca9e..ca9449f2da 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -1138,8 +1138,8 @@ static void homeaxis(int axis) { #if defined (ENABLE_AUTO_BED_LEVELING) && (PROBE_SERVO_DEACTIVATION_DELAY > 0) #ifndef Z_PROBE_SLED if (axis==Z_AXIS) retract_z_probe(); - #endif# -endif + #endif +#endif } } @@ -1193,7 +1193,7 @@ void refresh_cmd_timeout(void) } //retract #endif //FWRETRACT -#ifdef ENABLE_AUTO_BED_LEVELING +#ifdef Z_PROBE_SLED // // Method to dock/undock a sled designed by Charles Bell. //