Browse Source

🔧 Enforce BLTouch settings (#22086)

ellensp 3 years ago
parent
commit
54d526f6b6
No account linked to committer's email address
2 changed files with 6 additions and 9 deletions
  1. 3
    8
      Marlin/src/inc/Conditionals_LCD.h
  2. 3
    1
      buildroot/tests/mega1280

+ 3
- 8
Marlin/src/inc/Conditionals_LCD.h View File

@@ -718,22 +718,17 @@
718 718
     #define Z_PROBE_SERVO_NR 0
719 719
   #endif
720 720
   #ifdef DEACTIVATE_SERVOS_AFTER_MOVE
721
-    #warning "BLTOUCH requires DEACTIVATE_SERVOS_AFTER_MOVE to be to disabled. Undefining DEACTIVATE_SERVOS_AFTER_MOVE. Please update your Configuration.h file."
722
-    #undef DEACTIVATE_SERVOS_AFTER_MOVE
721
+    #error "BLTOUCH requires DEACTIVATE_SERVOS_AFTER_MOVE to be to disabled. Please update your Configuration.h file."
723 722
   #endif
724 723
 
725 724
   // Always disable probe pin inverting for BLTouch
726 725
   #if Z_MIN_PROBE_ENDSTOP_INVERTING
727
-    #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."
728
-    #undef Z_MIN_PROBE_ENDSTOP_INVERTING
729
-    #define Z_MIN_PROBE_ENDSTOP_INVERTING false
726
+    #error "BLTOUCH requires Z_MIN_PROBE_ENDSTOP_INVERTING set to false. Please update your Configuration.h file."
730 727
   #endif
731 728
 
732 729
   #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
733 730
     #if Z_MIN_ENDSTOP_INVERTING
734
-      #warning "BLTOUCH requires Z_MIN_ENDSTOP_INVERTING set to false. Resetting Z_MIN_ENDSTOP_INVERTING to false. Please update your Configuration.h file."
735
-      #undef Z_MIN_ENDSTOP_INVERTING
736
-      #define Z_MIN_ENDSTOP_INVERTING false
731
+      #error "BLTOUCH requires Z_MIN_ENDSTOP_INVERTING set to false. Please update your Configuration.h file."
737 732
     #endif
738 733
   #endif
739 734
 #endif

+ 3
- 1
buildroot/tests/mega1280 View File

@@ -47,7 +47,9 @@ exec_test $1 $2 "RAMPS | DELTA | RRD LCD | DELTA_AUTO_CALIBRATION | DELTA_CALIBR
47 47
 #
48 48
 # Delta Config (generic) + ABL bilinear + BLTOUCH
49 49
 use_example_configs delta/generic
50
-opt_set LCD_LANGUAGE cz
50
+opt_set LCD_LANGUAGE cz \
51
+        Z_MIN_PROBE_ENDSTOP_INVERTING false \
52
+        Z_MIN_ENDSTOP_INVERTING false
51 53
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR BLTOUCH
52 54
 exec_test $1 $2 "DELTA | RRD LCD | ABL Bilinear | BLTOUCH" "$3"
53 55
 

Loading…
Cancel
Save