Filling in more places where Z_PROBE_PIN and Z_PROBE_AND_ENDSTOP need to

be. Added Sanity Check for it. Added hook so it's enabled.
2015-03-28 05:55:42 -05:00
parent fd823449ad
commit 8b81f20c61
3 changed files with 12 additions and 6 deletions
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@ -1290,8 +1290,13 @@ static void engage_z_probe() {
    
    st_synchronize();
    
+    #if defined(Z_PROBE_AND_ENDSTOP)
+    bool z_probe_endstop = (READ(Z_PROBE_PIN) != Z_PROBE_ENDSTOP_INVERTING);
+    if (z_probe_endstop)
+    #else
    bool z_min_endstop = (READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING);
    if (z_min_endstop)
+    #endif
    {
        if (!Stopped)
        {