From 8b81f20c6127f4fd579512f004a85facf1a2501a Mon Sep 17 00:00:00 2001
From: Chris Roadfeldt <chris@roadfeldt.com>
Date: Sat, 28 Mar 2015 05:55:42 -0500
Subject: [PATCH] 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.
---
Marlin/Marlin_main.cpp | 5 +++++
Marlin/SanityCheck.h | 11 ++++++-----
Marlin/pins.h | 2 +-
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index ca06000b6a..7f8592b2c0 100644
--- 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)
{
diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h
index d5183abbaa..1024b6ab47 100644
--- a/Marlin/SanityCheck.h
+++ b/Marlin/SanityCheck.h
@@ -90,13 +90,14 @@
* Require a Z Min pin
*/
#if Z_MIN_PIN == -1
- #ifdef Z_PROBE_REPEATABILITY_TEST
- #error You must have a Z_MIN endstop to enable Z_PROBE_REPEATABILITY_TEST.
- #else
- #error ENABLE_AUTO_BED_LEVELING requires a Z_MIN endstop. Z_MIN_PIN must point to a valid hardware pin.
+ #if Z_PROBE_PIN == -1
+ #ifdef Z_PROBE_REPEATABILITY_TEST
+ #error You must have a Z_MIN endstop to enable Z_PROBE_REPEATABILITY_TEST.
+ #else
+ #error ENABLE_AUTO_BED_LEVELING requires a Z_MIN or Z_PROBE endstop. Z_MIN_PIN or Z_PROBE_PIN must point to a valid hardware pin.
+ #endif
#endif
#endif
-
/**
* Check if Probe_Offset * Grid Points is greater than Probing Range
*/
diff --git a/Marlin/pins.h b/Marlin/pins.h
index 8f013d5d01..e9d06e998c 100644
--- a/Marlin/pins.h
+++ b/Marlin/pins.h
@@ -211,7 +211,7 @@
#define Z_MIN_PIN -1
#endif
-#define SENSITIVE_PINS { 0, 1, X_STEP_PIN, X_DIR_PIN, X_ENABLE_PIN, X_MIN_PIN, X_MAX_PIN, Y_STEP_PIN, Y_DIR_PIN, Y_ENABLE_PIN, Y_MIN_PIN, Y_MAX_PIN, Z_STEP_PIN, Z_DIR_PIN, Z_ENABLE_PIN, Z_MIN_PIN, Z_MAX_PIN, PS_ON_PIN, \
+#define SENSITIVE_PINS { 0, 1, X_STEP_PIN, X_DIR_PIN, X_ENABLE_PIN, X_MIN_PIN, X_MAX_PIN, Y_STEP_PIN, Y_DIR_PIN, Y_ENABLE_PIN, Y_MIN_PIN, Y_MAX_PIN, Z_STEP_PIN, Z_DIR_PIN, Z_ENABLE_PIN, Z_MIN_PIN, Z_MAX_PIN, Z_PROBE_PIN, PS_ON_PIN, \
HEATER_BED_PIN, FAN_PIN, \
_E0_PINS _E1_PINS _E2_PINS _E3_PINS \
analogInputToDigitalPin(TEMP_BED_PIN) \