From 7bcab26f2a094407deb33f6b492a0c9c57ac5709 Mon Sep 17 00:00:00 2001 From: AnHardt Date: Mon, 11 Jul 2016 22:01:44 +0200 Subject: [PATCH] Don't deploy/stow the probe if z-min-endstop is used for homing Don't deploy/stow the probe if z-min-endstop is used for homing. Don't apply `zprobe_zoffset` if probe was not used. --- 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 31545ab478..9f60855e5a 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -1525,7 +1525,7 @@ static void set_axis_is_at_home(AxisEnum axis) { current_position[axis] = base_home_pos(axis) + home_offset[axis]; update_software_endstops(axis); - #if HAS_BED_PROBE && Z_HOME_DIR < 0 + #if HAS_BED_PROBE && Z_HOME_DIR < 0 && DISABLED(Z_MIN_PROBE_ENDSTOP) if (axis == Z_AXIS) { current_position[Z_AXIS] -= zprobe_zoffset; #if ENABLED(DEBUG_LEVELING_FEATURE) @@ -2362,7 +2362,7 @@ static void homeaxis(AxisEnum axis) { home_dir(axis); // Homing Z towards the bed? Deploy the Z probe or endstop. - #if HAS_BED_PROBE + #if HAS_BED_PROBE && DISABLED(Z_MIN_PROBE_ENDSTOP) if (axis == Z_AXIS && axis_home_dir < 0) { #if ENABLED(DEBUG_LEVELING_FEATURE) if (DEBUGGING(LEVELING)) SERIAL_ECHOPGM("> "); @@ -2463,7 +2463,7 @@ static void homeaxis(AxisEnum axis) { axis_homed[axis] = true; // Put away the Z probe - #if HAS_BED_PROBE + #if HAS_BED_PROBE && DISABLED(Z_MIN_PROBE_ENDSTOP) if (axis == Z_AXIS && axis_home_dir < 0) { #if ENABLED(DEBUG_LEVELING_FEATURE) if (DEBUGGING(LEVELING)) SERIAL_ECHOPGM("> ");