b4tman
/
Marlin
1
0
Fork 0
Code Issues Releases 3 Activity

Apply specific menu item types

This commit is contained in:
Scott Lahteine 2020-08-21 02:42:50 -05:00
parent bf316d9ec5
commit ba6c41b798
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,13 +138,11 @@ void menu_main() {
if (card_detected) { if (card_detected) {
if (!card_open) { if (!card_open) {
SUBMENU(MSG_MEDIA_MENU, TERN(PASSWORD_ON_SD_PRINT_MENU, password.media_gatekeeper, menu_media)); SUBMENU(MSG_MEDIA_MENU, TERN(PASSWORD_ON_SD_PRINT_MENU, password.media_gatekeeper, menu_media));
MENU_ITEM(gcode, #if PIN_EXISTS(SD_DETECT)
#if PIN_EXISTS(SD_DETECT) GCODES_ITEM(MSG_CHANGE_MEDIA, M21_STR);
MSG_CHANGE_MEDIA, M21_STR #else
#else GCODES_ITEM(MSG_RELEASE_MEDIA, PSTR("M22"));
MSG_RELEASE_MEDIA, PSTR("M22") #endif
#endif
);
} }
} }
else { else {
@ -172,7 +170,7 @@ void menu_main() {
#endif #endif
#if HAS_POWER_MONITOR #if HAS_POWER_MONITOR
MENU_ITEM(submenu, MSG_POWER_MONITOR, menu_power_monitor); SUBMENU(MSG_POWER_MONITOR, menu_power_monitor);
#endif #endif
#if ENABLED(MIXING_EXTRUDER) #if ENABLED(MIXING_EXTRUDER)
@ -237,13 +235,11 @@ void menu_main() {
if (card_detected) { if (card_detected) {
if (!card_open) { if (!card_open) {
MENU_ITEM(gcode, #if PIN_EXISTS(SD_DETECT)
#if PIN_EXISTS(SD_DETECT) GCODES_ITEM(MSG_CHANGE_MEDIA, M21_STR);
MSG_CHANGE_MEDIA, M21_STR #else
#else GCODES_ITEM(MSG_RELEASE_MEDIA, PSTR("M22"));
MSG_RELEASE_MEDIA, PSTR("M22") #endif
#endif
);
SUBMENU(MSG_MEDIA_MENU, TERN(PASSWORD_ON_SD_PRINT_MENU, password.media_gatekeeper, menu_media)); SUBMENU(MSG_MEDIA_MENU, TERN(PASSWORD_ON_SD_PRINT_MENU, password.media_gatekeeper, menu_media));
} }
} }