CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor tweak to main menu

Browse Source
This commit is contained in:
Scott Lahteine 2019-02-02 17:08:44 -06:00
parent d4d1b28a06
commit e10943d0d8
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,7 +104,12 @@ void menu_main() {
START_MENU(); START_MENU();
MENU_BACK(MSG_WATCH); MENU_BACK(MSG_WATCH);
const bool busy = printer_busy(); const bool busy = printer_busy(),
#if ENABLED(SDSUPPORT)
card_detected = card.isDetected(),
card_open = card_detected && card.isFileOpen()
#endif
;
if (busy) { if (busy) {
MENU_ITEM(function, MSG_PAUSE_PRINT, lcd_pause); MENU_ITEM(function, MSG_PAUSE_PRINT, lcd_pause);
@ -122,8 +127,8 @@ void menu_main() {
if (!busy) MENU_ITEM(function, MSG_AUTOSTART, card.beginautostart); if (!busy) MENU_ITEM(function, MSG_AUTOSTART, card.beginautostart);
#endif #endif
if (card.isDetected()) { if (card_detected) {
if (!card.isFileOpen()) { if (!card_open) {
MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard); MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
#if !PIN_EXISTS(SD_DETECT) #if !PIN_EXISTS(SD_DETECT)
MENU_ITEM(gcode, MSG_CHANGE_SDCARD, PSTR("M21")); // SD-card changed by user MENU_ITEM(gcode, MSG_CHANGE_SDCARD, PSTR("M21")); // SD-card changed by user
@ -196,8 +201,8 @@ void menu_main() {
if (!busy) MENU_ITEM(function, MSG_AUTOSTART, card.beginautostart); if (!busy) MENU_ITEM(function, MSG_AUTOSTART, card.beginautostart);
#endif #endif
if (card.isDetected()) { if (card_detected) {
if (!card.isFileOpen()) { if (!card_open) {
MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard); MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
#if !PIN_EXISTS(SD_DETECT) #if !PIN_EXISTS(SD_DETECT)
MENU_ITEM(gcode, MSG_CHANGE_SDCARD, PSTR("M21")); // SD-card changed by user MENU_ITEM(gcode, MSG_CHANGE_SDCARD, PSTR("M21")); // SD-card changed by user