From cb1b31f69b2e6e11bdb1f77a5af7a9fae603f610 Mon Sep 17 00:00:00 2001 From: AnHardt Date: Fri, 1 Jul 2016 15:28:41 +0200 Subject: [PATCH] Unconditional do_probe_raise() in probe_pt() If Z_RAISE_BETWEEN_PROBINGS is null or undefined the probe is currently not raised by home_offset[Z_AXIS] and zprobe_zoffset. But when different from 0 is. If an undefined Z_RAISE_BETWEEN_PROBINGS expands to 0 (and it does) this is the solution. A similar asymmetry exists with the newly introduced 'short-cut' in G28 - but its the rise before anything is probed - so should not make a difference. --- Marlin/Marlin_main.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 78f1cabc6..b05f5b523 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -2118,14 +2118,12 @@ static void clean_up_after_endstop_or_probe_move() { #endif stow_z_probe(); } - #if Z_RAISE_BETWEEN_PROBINGS > 0 - else { - #if ENABLED(DEBUG_LEVELING_FEATURE) - if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("> do_probe_raise"); - #endif - do_probe_raise(Z_RAISE_BETWEEN_PROBINGS); - } - #endif + else { + #if ENABLED(DEBUG_LEVELING_FEATURE) + if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("> do_probe_raise"); + #endif + do_probe_raise(Z_RAISE_BETWEEN_PROBINGS); + } if (verbose_level > 2) { SERIAL_PROTOCOLPGM("Bed X: ");