From bb38c816af1a89bf2b7087b6b406a2aef1a30e2f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Thu, 23 Jun 2016 18:00:20 -0700
Subject: [PATCH] Always raise in deploy_z_probe / stow_z_probe
---
Marlin/Marlin_main.cpp | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index a4b933912d..c62e32904e 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -1811,15 +1811,17 @@ static void clean_up_after_endstop_or_probe_move() {
if (endstops.z_probe_enabled) return;
+ // Make room for probe
+ #if Z_RAISE_BEFORE_PROBING > 0
+ do_probe_raise(Z_RAISE_BEFORE_PROBING);
+ #endif
+
#if ENABLED(Z_PROBE_SLED)
dock_sled(false);
#elif HAS_Z_SERVO_ENDSTOP
- // Make room for Z Servo
- do_probe_raise(Z_RAISE_BEFORE_PROBING);
-
// Engage Z Servo endstop if enabled
DEPLOY_Z_SERVO();
@@ -1913,15 +1915,17 @@ static void clean_up_after_endstop_or_probe_move() {
if (!endstops.z_probe_enabled) return;
+ // Make more room for the servo
+ #if Z_RAISE_AFTER_PROBING > 0
+ do_probe_raise(Z_RAISE_AFTER_PROBING);
+ #endif
+
#if ENABLED(Z_PROBE_SLED)
dock_sled(true);
#elif HAS_Z_SERVO_ENDSTOP
- // Make room for the servo
- do_probe_raise(Z_RAISE_AFTER_PROBING);
-
// Change the Z servo angle
STOW_Z_SERVO();
--
GitLab