Sfoglia il codice sorgente

🔧 Enforce BLTouch settings (#22086)

ellensp 4 anni fa
parent
commit
54d526f6b6
Nessun account collegato all'indirizzo email del committer
2 ha cambiato i file con 6 aggiunte e 9 eliminazioni
  1. 3
    8
      Marlin/src/inc/Conditionals_LCD.h
  2. 3
    1
      buildroot/tests/mega1280

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

718
     #define Z_PROBE_SERVO_NR 0
718
     #define Z_PROBE_SERVO_NR 0
719
   #endif
719
   #endif
720
   #ifdef DEACTIVATE_SERVOS_AFTER_MOVE
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
   #endif
722
   #endif
724
 
723
 
725
   // Always disable probe pin inverting for BLTouch
724
   // Always disable probe pin inverting for BLTouch
726
   #if Z_MIN_PROBE_ENDSTOP_INVERTING
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
   #endif
727
   #endif
731
 
728
 
732
   #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
729
   #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
733
     #if Z_MIN_ENDSTOP_INVERTING
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
     #endif
732
     #endif
738
   #endif
733
   #endif
739
 #endif
734
 #endif

+ 3
- 1
buildroot/tests/mega1280 Vedi File

47
 #
47
 #
48
 # Delta Config (generic) + ABL bilinear + BLTOUCH
48
 # Delta Config (generic) + ABL bilinear + BLTOUCH
49
 use_example_configs delta/generic
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
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR BLTOUCH
53
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR BLTOUCH
52
 exec_test $1 $2 "DELTA | RRD LCD | ABL Bilinear | BLTOUCH" "$3"
54
 exec_test $1 $2 "DELTA | RRD LCD | ABL Bilinear | BLTOUCH" "$3"
53
 
55
 

Loading…
Annulla
Salva