Extended condition macros (#13419)
Allow `ENABLED`, `DISABLED`, `PIN_EXISTS`, and `BUTTON_EXISTS` to take multiple arguments. Also add: - Alias `ANY(...)` for `!DISABLED(...)` - Alias `ANY_PIN(...)` for `PIN_EXISTS(a) || PIN_EXISTS(b) ...` - Alias `EITHER(A,B)` for `ANY(...)` - Alias `ALL(...)` and `BOTH(A,B)` for `ENABLED(...)` - `NONE(...)` for `DISABLED(...)`
This commit is contained in:
@@ -123,7 +123,7 @@
|
||||
//
|
||||
// LCD / Controller
|
||||
//
|
||||
#if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
|
||||
#if BOTH(ULTRA_LCD, NEWPANEL)
|
||||
|
||||
#define LCD_PINS_RS 9 // E1 JP11-11
|
||||
#define LCD_PINS_ENABLE 8 // E0 JP11-10
|
||||
@@ -132,7 +132,7 @@
|
||||
#define LCD_PINS_D6 5 // D5 JP11-6
|
||||
#define LCD_PINS_D7 4 // D4 JP11-5
|
||||
|
||||
#if ENABLED(VIKI2) || ENABLED(miniVIKI)
|
||||
#if ANY(VIKI2, miniVIKI)
|
||||
#define BEEPER_PIN 8 // E0 JP11-10
|
||||
|
||||
#define DOGLCD_A0 40 // F2 JP2-2
|
||||
|
Reference in New Issue
Block a user