3DPrinting/Marlin-Tevo-Tarantula
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Extended condition macros (#13419)

Browse source 
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:
Scott Lahteine 2019-03-16 23:43:06 -05:00 • committed by GitHub
parent d20eab4f83
commit 49cf92dc36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
281 changed files with 1299 additions and 1288 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/lcd/menu/menu_main.cpp
View file

@ -46,8 +46,8 @@
#include "../../feature/host_actions.h"
#endif
#define MACHINE_CAN_STOP (ENABLED(SDSUPPORT) || ENABLED(HOST_PROMPT_SUPPORT) || defined(ACTION_ON_CANCEL))
#define MACHINE_CAN_PAUSE (ENABLED(SDSUPPORT) || ENABLED(HOST_PROMPT_SUPPORT) || ENABLED(PARK_HEAD_ON_PAUSE) || defined(ACTION_ON_PAUSE))
#define MACHINE_CAN_STOP (EITHER(SDSUPPORT, HOST_PROMPT_SUPPORT) || defined(ACTION_ON_CANCEL))
#define MACHINE_CAN_PAUSE (ANY(SDSUPPORT, HOST_PROMPT_SUPPORT, PARK_HEAD_ON_PAUSE) || defined(ACTION_ON_PAUSE))
#if MACHINE_CAN_PAUSE