|
@ -104,9 +104,36 @@ void menu_main() { |
|
|
if (card.isFileOpen()) |
|
|
if (card.isFileOpen()) |
|
|
MENU_ITEM(submenu, MSG_STOP_PRINT, menu_sdcard_abort_confirm); |
|
|
MENU_ITEM(submenu, MSG_STOP_PRINT, menu_sdcard_abort_confirm); |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
#if !defined(ACTION_ON_RESUME) && ENABLED(SDSUPPORT) |
|
|
|
|
|
if (card.isFileOpen()) |
|
|
|
|
|
#endif |
|
|
MENU_ITEM(submenu, MSG_TUNE, menu_tune); |
|
|
MENU_ITEM(submenu, MSG_TUNE, menu_tune); |
|
|
} |
|
|
} |
|
|
else { |
|
|
else { |
|
|
|
|
|
#if !HAS_ENCODER_WHEEL && ENABLED(SDSUPPORT) |
|
|
|
|
|
//
|
|
|
|
|
|
// Autostart
|
|
|
|
|
|
//
|
|
|
|
|
|
#if ENABLED(MENU_ADDAUTOSTART) |
|
|
|
|
|
if (!busy) MENU_ITEM(function, MSG_AUTOSTART, card.beginautostart); |
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
if (card.isDetected()) { |
|
|
|
|
|
if (!card.isFileOpen()) { |
|
|
|
|
|
MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard); |
|
|
|
|
|
#if !PIN_EXISTS(SD_DETECT) |
|
|
|
|
|
MENU_ITEM(gcode, MSG_CHANGE_SDCARD, PSTR("M21")); // SD-card changed by user
|
|
|
|
|
|
#endif |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
#if !PIN_EXISTS(SD_DETECT) |
|
|
|
|
|
MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21")); // Manually init SD-card
|
|
|
|
|
|
#endif |
|
|
|
|
|
MENU_ITEM(function, MSG_NO_CARD, NULL); |
|
|
|
|
|
} |
|
|
|
|
|
#endif // !HAS_ENCODER_WHEEL && SDSUPPORT
|
|
|
|
|
|
|
|
|
MENU_ITEM(function, MSG_RESUME_PRINT, lcd_resume); |
|
|
MENU_ITEM(function, MSG_RESUME_PRINT, lcd_resume); |
|
|
|
|
|
|
|
|
MENU_ITEM(submenu, MSG_MOTION, menu_motion); |
|
|
MENU_ITEM(submenu, MSG_MOTION, menu_motion); |
|
@ -148,22 +175,20 @@ 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) |
|
|
#if HAS_ENCODER_WHEEL && ENABLED(SDSUPPORT) |
|
|
|
|
|
|
|
|
//
|
|
|
//
|
|
|
// Autostart
|
|
|
// Autostart
|
|
|
//
|
|
|
//
|
|
|
#if 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 (card.isDetected()) { |
|
|
if (card.isDetected()) { |
|
|
if(!card.isFileOpen()) { |
|
|
if (!card.isFileOpen()) { |
|
|
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
|
|
|
#endif |
|
|
#endif |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
else { |
|
|
else { |
|
@ -172,7 +197,7 @@ void menu_main() { |
|
|
#endif |
|
|
#endif |
|
|
MENU_ITEM(function, MSG_NO_CARD, NULL); |
|
|
MENU_ITEM(function, MSG_NO_CARD, NULL); |
|
|
} |
|
|
} |
|
|
#endif // SDSUPPORT
|
|
|
#endif // HAS_ENCODER_WHEEL && SDSUPPORT
|
|
|
|
|
|
|
|
|
END_MENU(); |
|
|
END_MENU(); |
|
|
} |
|
|
} |
|
|