Ver código fonte

Minor tweak to main menu

Scott Lahteine 6 anos atrás
pai
commit
e10943d0d8
1 arquivos alterados com 10 adições e 5 exclusões
  1. 10
    5
      Marlin/src/lcd/menu/menu_main.cpp

+ 10
- 5
Marlin/src/lcd/menu/menu_main.cpp Ver arquivo

@@ -104,7 +104,12 @@ void menu_main() {
104 104
   START_MENU();
105 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 114
   if (busy) {
110 115
     MENU_ITEM(function, MSG_PAUSE_PRINT, lcd_pause);
@@ -122,8 +127,8 @@ void menu_main() {
122 127
         if (!busy) MENU_ITEM(function, MSG_AUTOSTART, card.beginautostart);
123 128
       #endif
124 129
 
125
-      if (card.isDetected()) {
126
-        if (!card.isFileOpen()) {
130
+      if (card_detected) {
131
+        if (!card_open) {
127 132
           MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
128 133
           #if !PIN_EXISTS(SD_DETECT)
129 134
             MENU_ITEM(gcode, MSG_CHANGE_SDCARD, PSTR("M21"));  // SD-card changed by user
@@ -196,8 +201,8 @@ void menu_main() {
196 201
       if (!busy) MENU_ITEM(function, MSG_AUTOSTART, card.beginautostart);
197 202
     #endif
198 203
 
199
-    if (card.isDetected()) {
200
-      if (!card.isFileOpen()) {
204
+    if (card_detected) {
205
+      if (!card_open) {
201 206
         MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
202 207
         #if !PIN_EXISTS(SD_DETECT)
203 208
           MENU_ITEM(gcode, MSG_CHANGE_SDCARD, PSTR("M21"));  // SD-card changed by user

Carregando…
Cancelar
Salvar