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

🚸 Hide auto-run as needed (#26853)

Browse Source
This commit is contained in:
Sophist
2024-03-23 00:27:13 +00:00
committed by Scott Lahteine
parent cb62e14f27
commit e81b3fe677
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -233,12 +233,11 @@ void menu_configuration();
#endif #endif
void menu_main() { void menu_main() {
const bool busy = printingIsActive() const bool busy = printingIsActive();
#if HAS_MEDIA #if HAS_MEDIA
, card_detected = card.isMounted() const bool card_detected = card.isMounted(),
, card_open = card_detected && card.isFileOpen() card_open = card_detected && card.isFileOpen();
#endif #endif
;
START_MENU(); START_MENU();
BACK_ITEM(MSG_INFO_SCREEN); BACK_ITEM(MSG_INFO_SCREEN);
@@ -275,12 +274,12 @@ void menu_main() {
else { else {
#if ALL(HAS_MEDIA, MEDIA_MENU_AT_TOP) #if ALL(HAS_MEDIA, MEDIA_MENU_AT_TOP)
// BEGIN MEDIA MENU // BEGIN MEDIA MENU
if (card_detected) {
if (!card_open) {
#if ENABLED(MENU_ADDAUTOSTART) #if ENABLED(MENU_ADDAUTOSTART)
ACTION_ITEM(MSG_RUN_AUTO_FILES, card.autofile_begin); // Run Auto Files ACTION_ITEM(MSG_RUN_AUTO_FILES, card.autofile_begin); // Run Auto Files
#endif #endif
if (card_detected) {
if (!card_open) {
#if HAS_SD_DETECT #if HAS_SD_DETECT
GCODES_ITEM(MSG_CHANGE_MEDIA, F("M21" TERN_(MULTI_VOLUME, "S"))); // M21 Change Media GCODES_ITEM(MSG_CHANGE_MEDIA, F("M21" TERN_(MULTI_VOLUME, "S"))); // M21 Change Media
#if ENABLED(MULTI_VOLUME) #if ENABLED(MULTI_VOLUME)
@@ -392,12 +391,12 @@ void menu_main() {
#if HAS_MEDIA && DISABLED(MEDIA_MENU_AT_TOP) #if HAS_MEDIA && DISABLED(MEDIA_MENU_AT_TOP)
// BEGIN MEDIA MENU // BEGIN MEDIA MENU
if (card_detected) {
if (!card_open) {
#if ENABLED(MENU_ADDAUTOSTART) #if ENABLED(MENU_ADDAUTOSTART)
ACTION_ITEM(MSG_RUN_AUTO_FILES, card.autofile_begin); // Run Auto Files ACTION_ITEM(MSG_RUN_AUTO_FILES, card.autofile_begin); // Run Auto Files
#endif #endif
if (card_detected) {
if (!card_open) {
#if HAS_SD_DETECT #if HAS_SD_DETECT
GCODES_ITEM(MSG_CHANGE_MEDIA, F("M21" TERN_(MULTI_VOLUME, "S"))); // M21 Change Media GCODES_ITEM(MSG_CHANGE_MEDIA, F("M21" TERN_(MULTI_VOLUME, "S"))); // M21 Change Media
#if ENABLED(MULTI_VOLUME) #if ENABLED(MULTI_VOLUME)