sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

♻️ EITHER/BOTH => ANY/ALL

Browse Source
This commit is contained in:
Scott Lahteine
2024-01-30 17:16:33 -06:00
parent fa85e9e066
commit 2e4b037dbf
296 changed files with 864 additions and 864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/lcd/menu/menu_main.cpp
View File

@@ -43,7 +43,7 @@
#include "game/game.h"
#endif
#if EITHER(SDSUPPORT, HOST_PROMPT_SUPPORT) || defined(ACTION_ON_CANCEL)
#if ANY(SDSUPPORT, HOST_PROMPT_SUPPORT) || defined(ACTION_ON_CANCEL)
#define MACHINE_CAN_STOP 1
#endif
#if ANY(SDSUPPORT, HOST_PROMPT_SUPPORT, PARK_HEAD_ON_PAUSE) || defined(ACTION_ON_PAUSE)
@@ -88,7 +88,7 @@ void menu_configuration();
void menu_info();
#endif
#if EITHER(LED_CONTROL_MENU, CASE_LIGHT_MENU)
#if ANY(LED_CONTROL_MENU, CASE_LIGHT_MENU)
void menu_led();
#endif
@@ -273,7 +273,7 @@ void menu_main() {
#endif
}
else {
#if BOTH(SDSUPPORT, MEDIA_MENU_AT_TOP)
#if ALL(SDSUPPORT, MEDIA_MENU_AT_TOP)
// BEGIN MEDIA MENU
#if ENABLED(MENU_ADDAUTOSTART)
ACTION_ITEM(MSG_RUN_AUTO_FILES, card.autofile_begin); // Run Auto Files
@@ -326,7 +326,7 @@ void menu_main() {
SUBMENU(MSG_MOTION, menu_motion);
}
#if BOTH(ADVANCED_PAUSE_FEATURE, DISABLE_ENCODER)
#if ALL(ADVANCED_PAUSE_FEATURE, DISABLE_ENCODER)
FILAMENT_CHANGE_ITEM();
#endif
@@ -366,7 +366,7 @@ void menu_main() {
SUBMENU(MSG_INFO_MENU, menu_info);
#endif
#if EITHER(LED_CONTROL_MENU, CASE_LIGHT_MENU)
#if ANY(LED_CONTROL_MENU, CASE_LIGHT_MENU)
SUBMENU(MSG_LEDS, menu_led);
#endif