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:
@ -59,7 +59,7 @@
|
||||
#include "../../core/utility.h"
|
||||
#endif
|
||||
|
||||
#if DO_SWITCH_EXTRUDER || ENABLED(SWITCHING_NOZZLE) || ENABLED(PARKING_EXTRUDER)
|
||||
#if DO_SWITCH_EXTRUDER || EITHER(SWITCHING_NOZZLE, PARKING_EXTRUDER)
|
||||
#include "../../module/tool_change.h"
|
||||
#endif
|
||||
|
||||
@ -297,7 +297,7 @@ namespace ExtUI {
|
||||
void setActiveTool(const extruder_t extruder, bool no_move) {
|
||||
#if EXTRUDERS > 1
|
||||
const uint8_t e = extruder - E0;
|
||||
#if DO_SWITCH_EXTRUDER || ENABLED(SWITCHING_NOZZLE) || ENABLED(PARKING_EXTRUDER)
|
||||
#if DO_SWITCH_EXTRUDER || EITHER(SWITCHING_NOZZLE, PARKING_EXTRUDER)
|
||||
if (e != active_extruder)
|
||||
tool_change(e, 0, no_move);
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user