From 8ea55323d86caeeca504928ae19d4bfd888d14c5 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 15 Feb 2016 14:52:04 -0600 Subject: [PATCH 1/2] Fix for not raising Z before homing X and Y --- Marlin/Marlin_main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index d21bd599e..066a85038 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -2308,7 +2308,8 @@ inline void gcode_G28() { } #endif - #elif DISABLED(Z_SAFE_HOMING) && defined(Z_RAISE_BEFORE_HOMING) && Z_RAISE_BEFORE_HOMING > 0 + #elif defined(Z_RAISE_BEFORE_HOMING) && Z_RAISE_BEFORE_HOMING > 0 +// #elif DISABLED(Z_SAFE_HOMING) && defined(Z_RAISE_BEFORE_HOMING) && Z_RAISE_BEFORE_HOMING > 0 // Raise Z before homing any other axes // (Does this need to be "negative home direction?" Why not just use Z_RAISE_BEFORE_HOMING?) From 31656e68bcb938e734a8eb35af4507e26af633a4 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 15 Feb 2016 15:53:40 -0600 Subject: [PATCH 2/2] Fix for homing X and Y before raising Z when Z_SAFE_HOMING is set. --- Marlin/Marlin_main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 066a85038..716eb92d2 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -2309,7 +2309,6 @@ inline void gcode_G28() { #endif #elif defined(Z_RAISE_BEFORE_HOMING) && Z_RAISE_BEFORE_HOMING > 0 -// #elif DISABLED(Z_SAFE_HOMING) && defined(Z_RAISE_BEFORE_HOMING) && Z_RAISE_BEFORE_HOMING > 0 // Raise Z before homing any other axes // (Does this need to be "negative home direction?" Why not just use Z_RAISE_BEFORE_HOMING?)