From 7f8a2025af18c44136ddc04d1fcf903b3321cbb6 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 21 Jun 2016 01:02:01 -0700 Subject: [PATCH] Move raise_z_after_probing into earlier block --- Marlin/Marlin_main.cpp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 119131b41..794aec5a8 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -1685,6 +1685,14 @@ static void setup_for_endstop_move() { do_blocking_move_to(current_position[X_AXIS], current_position[Y_AXIS], z); } + inline void raise_z_after_probing() { + #if Z_RAISE_AFTER_PROBING > 0 + #if ENABLED(DEBUG_LEVELING_FEATURE) + if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("raise_z_after_probing()"); + #endif + do_blocking_move_to_z(current_position[Z_AXIS] + Z_RAISE_AFTER_PROBING); + #endif + } #endif //HAS_BED_PROBE #if HAS_Z_SERVO_ENDSTOP @@ -1710,18 +1718,6 @@ static void setup_for_endstop_move() { #endif -#if HAS_BED_PROBE - - inline void raise_z_after_probing() { - #if Z_RAISE_AFTER_PROBING > 0 - #if ENABLED(DEBUG_LEVELING_FEATURE) - if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("raise_z_after_probing()"); - #endif - do_blocking_move_to_z(current_position[Z_AXIS] + Z_RAISE_AFTER_PROBING); - #endif - } -#endif - #if ENABLED(Z_PROBE_SLED) #ifndef SLED_DOCKING_OFFSET