From b27447ef484b86d573e7ba60960df2f008df37d4 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Thu, 10 Jun 2021 19:09:52 +1200
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Enforce=20BLTouch=20settings=20(?=
 =?UTF-8?q?#22086)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_LCD.h | 11 +++--------
 buildroot/tests/mega1280          |  4 +++-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 0eaa74912..ea83b5abb 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -718,22 +718,17 @@
     #define Z_PROBE_SERVO_NR 0
   #endif
   #ifdef DEACTIVATE_SERVOS_AFTER_MOVE
-    #warning "BLTOUCH requires DEACTIVATE_SERVOS_AFTER_MOVE to be to disabled. Undefining DEACTIVATE_SERVOS_AFTER_MOVE. Please update your Configuration.h file."
-    #undef DEACTIVATE_SERVOS_AFTER_MOVE
+    #error "BLTOUCH requires DEACTIVATE_SERVOS_AFTER_MOVE to be to disabled. Please update your Configuration.h file."
   #endif
 
   // Always disable probe pin inverting for BLTouch
   #if Z_MIN_PROBE_ENDSTOP_INVERTING
-    #warning "BLTOUCH requires Z_MIN_PROBE_ENDSTOP_INVERTING set to false. Resetting Z_MIN_PROBE_ENDSTOP_INVERTING to false. Please update your Configuration.h file."
-    #undef Z_MIN_PROBE_ENDSTOP_INVERTING
-    #define Z_MIN_PROBE_ENDSTOP_INVERTING false
+    #error "BLTOUCH requires Z_MIN_PROBE_ENDSTOP_INVERTING set to false. Please update your Configuration.h file."
   #endif
 
   #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
     #if Z_MIN_ENDSTOP_INVERTING
-      #warning "BLTOUCH requires Z_MIN_ENDSTOP_INVERTING set to false. Resetting Z_MIN_ENDSTOP_INVERTING to false. Please update your Configuration.h file."
-      #undef Z_MIN_ENDSTOP_INVERTING
-      #define Z_MIN_ENDSTOP_INVERTING false
+      #error "BLTOUCH requires Z_MIN_ENDSTOP_INVERTING set to false. Please update your Configuration.h file."
     #endif
   #endif
 #endif
diff --git a/buildroot/tests/mega1280 b/buildroot/tests/mega1280
index 8b16b1dbc..d8cefbaf8 100755
--- a/buildroot/tests/mega1280
+++ b/buildroot/tests/mega1280
@@ -47,7 +47,9 @@ exec_test $1 $2 "RAMPS | DELTA | RRD LCD | DELTA_AUTO_CALIBRATION | DELTA_CALIBR
 #
 # Delta Config (generic) + ABL bilinear + BLTOUCH
 use_example_configs delta/generic
-opt_set LCD_LANGUAGE cz
+opt_set LCD_LANGUAGE cz \
+        Z_MIN_PROBE_ENDSTOP_INVERTING false \
+        Z_MIN_ENDSTOP_INVERTING false
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR BLTOUCH
 exec_test $1 $2 "DELTA | RRD LCD | ABL Bilinear | BLTOUCH" "$3"