From e2b87f6c85ae30d1d980902e013895c9a6a55f65 Mon Sep 17 00:00:00 2001
From: esenapaj <esenapaj@users.noreply.github.com>
Date: Tue, 10 May 2016 22:26:41 +0900
Subject: [PATCH] Separate Z_PROBE_ALLEN_KEY from MECHANICAL_PROBE
---
Marlin/Conditionals.h | 9 +--------
Marlin/Marlin_main.cpp | 2 +-
Marlin/SanityCheck.h | 5 +++--
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h
index eb9ee1883e..4583a0a5fb 100644
--- a/Marlin/Conditionals.h
+++ b/Marlin/Conditionals.h
@@ -387,13 +387,6 @@
#endif
#endif
- /**
- * Enable MECHANICAL_PROBE for Z_PROBE_ALLEN_KEY, for older configs
- */
- #if ENABLED(Z_PROBE_ALLEN_KEY)
- #define MECHANICAL_PROBE
- #endif
-
/**
* Host keep alive
*/
@@ -742,7 +735,7 @@
#endif
#endif
- #define PROBE_SELECTED (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(MECHANICAL_PROBE) || HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))
+ #define PROBE_SELECTED (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(MECHANICAL_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))
#define PROBE_PIN_CONFIGURED (HAS_Z_MIN_PROBE_PIN || (HAS_Z_MIN && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)))
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 2f1b287990..3751d61186 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -3238,7 +3238,7 @@ inline void gcode_G28() {
#if ENABLED(Z_PROBE_SLED)
dock_sled(false); // engage (un-dock) the Z probe
- #elif ENABLED(MECHANICAL_PROBE) || ENABLED(FIX_MOUNTED_PROBE) || (ENABLED(DELTA) && SERVO_LEVELING)
+ #elif ENABLED(FIX_MOUNTED_PROBE) || ENABLED(MECHANICAL_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || (ENABLED(DELTA) && SERVO_LEVELING)
deploy_z_probe();
#endif
diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h
index 914b0ff312..c45c716141 100644
--- a/Marlin/SanityCheck.h
+++ b/Marlin/SanityCheck.h
@@ -237,8 +237,9 @@
/**
* Only allow one probe option to be defined
*/
- #if (ENABLED(FIX_MOUNTED_PROBE) && (ENABLED(MECHANICAL_PROBE) || HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))) \
- || (ENABLED(MECHANICAL_PROBE) && (HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))) \
+ #if (ENABLED(FIX_MOUNTED_PROBE) && (ENABLED(MECHANICAL_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))) \
+ || (ENABLED(MECHANICAL_PROBE) && (ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))) \
+ || (ENABLED(Z_PROBE_ALLEN_KEY) && (HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))) \
|| (HAS_Z_ENDSTOP_SERVO && ENABLED(Z_PROBE_SLED))
#error "Please define only one type of probe: Z Servo, MECHANICAL_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or FIX_MOUNTED_PROBE."
#endif
--
GitLab