zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

🔧 Enforce BLTouch settings (#22086)

Browse source
This commit is contained in:
ellensp 2021-06-10 19:09:52 +12:00 committed by Scott Lahteine
parent c9a3ba99be
commit b27447ef48
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Marlin/src/inc/Conditionals_LCD.h
View file

@ -718,22 +718,17 @@
#define Z_PROBE_SERVO_NR 0 #define Z_PROBE_SERVO_NR 0
#endif #endif
#ifdef DEACTIVATE_SERVOS_AFTER_MOVE #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." #error "BLTOUCH requires DEACTIVATE_SERVOS_AFTER_MOVE to be to disabled. Please update your Configuration.h file."
#undef DEACTIVATE_SERVOS_AFTER_MOVE
#endif #endif
// Always disable probe pin inverting for BLTouch // Always disable probe pin inverting for BLTouch
#if Z_MIN_PROBE_ENDSTOP_INVERTING #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." #error "BLTOUCH requires Z_MIN_PROBE_ENDSTOP_INVERTING set to false. Please update your Configuration.h file."
#undef Z_MIN_PROBE_ENDSTOP_INVERTING
#define Z_MIN_PROBE_ENDSTOP_INVERTING false
#endif #endif
#if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
#if Z_MIN_ENDSTOP_INVERTING #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." #error "BLTOUCH requires Z_MIN_ENDSTOP_INVERTING set to false. Please update your Configuration.h file."
#undef Z_MIN_ENDSTOP_INVERTING
#define Z_MIN_ENDSTOP_INVERTING false
#endif #endif
#endif #endif
#endif #endif

4
buildroot/tests/mega1280
View file

@ -47,7 +47,9 @@ exec_test $1 $2 "RAMPS | DELTA | RRD LCD | DELTA_AUTO_CALIBRATION | DELTA_CALIBR
# #
# Delta Config (generic) + ABL bilinear + BLTOUCH # Delta Config (generic) + ABL bilinear + BLTOUCH
use_example_configs delta/generic 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 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" exec_test $1 $2 "DELTA | RRD LCD | ABL Bilinear | BLTOUCH" "$3"