Quellcode durchsuchen

Minor tweak to main menu

Scott Lahteine vor 6 Jahren
Ursprung
Commit
e10943d0d8
1 geänderte Dateien mit 10 neuen und 5 gelöschten Zeilen
  1. 10
    5
      Marlin/src/lcd/menu/menu_main.cpp

+ 10
- 5
Marlin/src/lcd/menu/menu_main.cpp Datei anzeigen

104
   START_MENU();
104
   START_MENU();
105
   MENU_BACK(MSG_WATCH);
105
   MENU_BACK(MSG_WATCH);
106
 
106
 
107
-  const bool busy = printer_busy();
107
+  const bool busy = printer_busy(),
108
+    #if ENABLED(SDSUPPORT)
109
+      card_detected = card.isDetected(),
110
+      card_open = card_detected && card.isFileOpen()
111
+    #endif
112
+  ;
108
 
113
 
109
   if (busy) {
114
   if (busy) {
110
     MENU_ITEM(function, MSG_PAUSE_PRINT, lcd_pause);
115
     MENU_ITEM(function, MSG_PAUSE_PRINT, lcd_pause);
122
         if (!busy) MENU_ITEM(function, MSG_AUTOSTART, card.beginautostart);
127
         if (!busy) MENU_ITEM(function, MSG_AUTOSTART, card.beginautostart);
123
       #endif
128
       #endif
124
 
129
 
125
-      if (card.isDetected()) {
126
-        if (!card.isFileOpen()) {
130
+      if (card_detected) {
131
+        if (!card_open) {
127
           MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
132
           MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
128
           #if !PIN_EXISTS(SD_DETECT)
133
           #if !PIN_EXISTS(SD_DETECT)
129
             MENU_ITEM(gcode, MSG_CHANGE_SDCARD, PSTR("M21"));  // SD-card changed by user
134
             MENU_ITEM(gcode, MSG_CHANGE_SDCARD, PSTR("M21"));  // SD-card changed by user
196
       if (!busy) MENU_ITEM(function, MSG_AUTOSTART, card.beginautostart);
201
       if (!busy) MENU_ITEM(function, MSG_AUTOSTART, card.beginautostart);
197
     #endif
202
     #endif
198
 
203
 
199
-    if (card.isDetected()) {
200
-      if (!card.isFileOpen()) {
204
+    if (card_detected) {
205
+      if (!card_open) {
201
         MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
206
         MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
202
         #if !PIN_EXISTS(SD_DETECT)
207
         #if !PIN_EXISTS(SD_DETECT)
203
           MENU_ITEM(gcode, MSG_CHANGE_SDCARD, PSTR("M21"));  // SD-card changed by user
208
           MENU_ITEM(gcode, MSG_CHANGE_SDCARD, PSTR("M21"));  // SD-card changed by user

Laden…
Abbrechen
Speichern