From 13e9d761b178d86c9db201626a56bfeadafa539d Mon Sep 17 00:00:00 2001
From: Philipp <philipp.kreuzbichler@eumig.com>
Date: Wed, 25 Jan 2023 08:55:17 +0100
Subject: [PATCH 1/2] Fixed sanity check errors for k8400 config with bl touch
---
Marlin/src/pins/ramps/pins_K8400.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Marlin/src/pins/ramps/pins_K8400.h b/Marlin/src/pins/ramps/pins_K8400.h
index 686c29b7fb8f..04f9d238826f 100644
--- a/Marlin/src/pins/ramps/pins_K8400.h
+++ b/Marlin/src/pins/ramps/pins_K8400.h
@@ -51,7 +51,7 @@
#define Y_STOP_PIN 14
#if EITHER(BLTOUCH, TOUCH_MI_PROBE)
- #define HAS_INVERTED_PROBE
+#define HAS_INVERTED_PROBE true
#endif
#include "pins_3DRAG.h" // ... RAMPS
From a249fcfdc9e729df742eb3b6795165fb6d4333d0 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 25 Jan 2023 22:11:37 -0600
Subject: [PATCH 2/2] use enabled macro
---
Marlin/src/inc/SanityCheck.h | 8 ++++----
Marlin/src/pins/ramps/pins_K8400.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 1aadbb19e3e2..e3c06b2c2ee0 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1808,7 +1808,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#error "BLTOUCH requires DEACTIVATE_SERVOS_AFTER_MOVE to be to disabled. Please update your Configuration.h file."
#endif
- #if HAS_INVERTED_PROBE
+ #if ENABLED(INVERTED_PROBE_STATE)
#if !Z_MIN_PROBE_ENDSTOP_INVERTING
#error "BLTOUCH requires Z_MIN_PROBE_ENDSTOP_INVERTING set to true."
#endif
@@ -1816,7 +1816,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#error "BLTOUCH requires Z_MIN_PROBE_ENDSTOP_INVERTING set to false."
#endif
#if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
- #if HAS_INVERTED_PROBE
+ #if ENABLED(INVERTED_PROBE_STATE)
#if !Z_MIN_ENDSTOP_INVERTING
#error "BLTOUCH requires Z_MIN_ENDSTOP_INVERTING set to true."
#endif
@@ -1848,7 +1848,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#elif !HAS_RESUME_CONTINUE
#error "TOUCH_MI_PROBE currently requires an LCD controller or EMERGENCY_PARSER."
#endif
- #if HAS_INVERTED_PROBE
+ #if ENABLED(INVERTED_PROBE_STATE)
#if !Z_MIN_PROBE_ENDSTOP_INVERTING
#error "TOUCH_MI_PROBE requires Z_MIN_PROBE_ENDSTOP_INVERTING set to true."
#endif
@@ -1856,7 +1856,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#error "TOUCH_MI_PROBE requires Z_MIN_PROBE_ENDSTOP_INVERTING set to false."
#endif
#if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
- #if HAS_INVERTED_PROBE
+ #if ENABLED(INVERTED_PROBE_STATE)
#if !Z_MIN_ENDSTOP_INVERTING
#error "TOUCH_MI_PROBE requires Z_MIN_ENDSTOP_INVERTING set to true."
#endif
diff --git a/Marlin/src/pins/ramps/pins_K8400.h b/Marlin/src/pins/ramps/pins_K8400.h
index 04f9d238826f..22ac1be8abc9 100644
--- a/Marlin/src/pins/ramps/pins_K8400.h
+++ b/Marlin/src/pins/ramps/pins_K8400.h
@@ -51,7 +51,7 @@
#define Y_STOP_PIN 14
#if EITHER(BLTOUCH, TOUCH_MI_PROBE)
-#define HAS_INVERTED_PROBE true
+ #define INVERTED_PROBE_STATE
#endif
#include "pins_3DRAG.h" // ... RAMPS