Tweak SD section of Main Menu

This commit is contained in:
Scott Lahteine 2019-01-13 17:59:32 -06:00
parent 1a79878dff
commit 3644c940bf

View File

@ -144,28 +144,31 @@ void menu_main() {
MENU_ITEM(gcode, MSG_SWITCH_PS_ON, PSTR("M80")); MENU_ITEM(gcode, MSG_SWITCH_PS_ON, PSTR("M80"));
#endif #endif
#if ENABLED(SDSUPPORT)
// //
// Autostart // Autostart
// //
#if ENABLED(SDSUPPORT) && ENABLED(MENU_ADDAUTOSTART) #if ENABLED(MENU_ADDAUTOSTART)
if (!busy) if (!busy)
MENU_ITEM(function, MSG_AUTOSTART, card.beginautostart); MENU_ITEM(function, MSG_AUTOSTART, card.beginautostart);
#endif #endif
#if ENABLED(SDSUPPORT)
if (card.isDetected() && !card.isFileOpen()) { if (card.isDetected() && !card.isFileOpen()) {
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
#endif #endif
MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
} }
else { else {
MENU_ITEM(function, MSG_NO_CARD, NULL);
#if !PIN_EXISTS(SD_DETECT) #if !PIN_EXISTS(SD_DETECT)
MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21")); // Manually initialize the SD-card via user interface MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21")); // Manually init SD-card
#endif #endif
MENU_ITEM(function, MSG_NO_CARD, NULL);
} }
#endif
#endif // SDSUPPORT
END_MENU(); END_MENU();
} }