Skip to content

Commit

Permalink
🔧 Enforce BLTouch settings (#22086)
Browse files Browse the repository at this point in the history
  • Loading branch information
ellensp authored Jun 10, 2021
1 parent 0e1e159 commit 54d526f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
11 changes: 3 additions & 8 deletions Marlin/src/inc/Conditionals_LCD.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion buildroot/tests/mega1280
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit 54d526f

Please sign in to comment.