From 829c92f1bae8ac40a8706113a751edc35eb53fcd Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Sun, 26 Jun 2016 15:38:54 -0700
Subject: [PATCH] Use Z_RAISE_BETWEEN_PROBINGS with MBL
---
Marlin/Marlin_main.cpp | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 132dc21f9b..989134316b 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -3137,7 +3137,9 @@ inline void gcode_G28() {
feedrate = homing_feedrate[X_AXIS];
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
- #if MIN_Z_HEIGHT_FOR_HOMING > 0
+ #if Z_RAISE_BETWEEN_PROBINGS > MIN_Z_HEIGHT_FOR_HOMING
+ + Z_RAISE_BETWEEN_PROBINGS
+ #elif MIN_Z_HEIGHT_FOR_HOMING > 0
+ MIN_Z_HEIGHT_FOR_HOMING
#endif
;
@@ -3147,7 +3149,7 @@ inline void gcode_G28() {
current_position[Y_AXIS] = y + home_offset[Y_AXIS];
line_to_current_position();
- #if MIN_Z_HEIGHT_FOR_HOMING > 0
+ #if Z_RAISE_BETWEEN_PROBINGS > 0 || MIN_Z_HEIGHT_FOR_HOMING > 0
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
line_to_current_position();
#endif
@@ -3252,7 +3254,9 @@ inline void gcode_G28() {
else {
// One last "return to the bed" (as originally coded) at completion
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
- #if MIN_Z_HEIGHT_FOR_HOMING > 0
+ #if Z_RAISE_BETWEEN_PROBINGS > MIN_Z_HEIGHT_FOR_HOMING
+ + Z_RAISE_BETWEEN_PROBINGS
+ #elif MIN_Z_HEIGHT_FOR_HOMING > 0
+ MIN_Z_HEIGHT_FOR_HOMING
#endif
;