Browse Source

Add SD Release when no SD_DETECT_PIN exists (#13857)

Clinton James 6 years ago
parent
commit
2740cc64d8
2 changed files with 30 additions and 12 deletions
  1. 6
    0
      Marlin/src/lcd/language/language_en.h
  2. 24
    12
      Marlin/src/lcd/menu/menu_main.cpp

+ 6
- 0
Marlin/src/lcd/language/language_en.h View File

67
 #ifndef MSG_SD_REMOVED
67
 #ifndef MSG_SD_REMOVED
68
   #define MSG_SD_REMOVED                      _UxGT("Card removed")
68
   #define MSG_SD_REMOVED                      _UxGT("Card removed")
69
 #endif
69
 #endif
70
+#ifndef MSG_SD_RELEASED
71
+  #define MSG_SD_RELEASED                     _UxGT("Card released")
72
+#endif
70
 #ifndef MSG_LCD_ENDSTOPS
73
 #ifndef MSG_LCD_ENDSTOPS
71
   #define MSG_LCD_ENDSTOPS                    _UxGT("Endstops") // Max length 8 characters
74
   #define MSG_LCD_ENDSTOPS                    _UxGT("Endstops") // Max length 8 characters
72
 #endif
75
 #endif
879
 #ifndef MSG_CHANGE_SDCARD
882
 #ifndef MSG_CHANGE_SDCARD
880
   #define MSG_CHANGE_SDCARD                   _UxGT("Change SD card")
883
   #define MSG_CHANGE_SDCARD                   _UxGT("Change SD card")
881
 #endif
884
 #endif
885
+#ifndef MSG_RELEASE_SDCARD
886
+  #define MSG_RELEASE_SDCARD                  _UxGT("Release SD card")
887
+#endif
882
 #ifndef MSG_ZPROBE_OUT
888
 #ifndef MSG_ZPROBE_OUT
883
   #define MSG_ZPROBE_OUT                      _UxGT("Z Probe past bed")
889
   #define MSG_ZPROBE_OUT                      _UxGT("Z Probe past bed")
884
 #endif
890
 #endif

+ 24
- 12
Marlin/src/lcd/menu/menu_main.cpp View File

178
       if (card_detected) {
178
       if (card_detected) {
179
         if (!card_open) {
179
         if (!card_open) {
180
           MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
180
           MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
181
-          #if !PIN_EXISTS(SD_DETECT)
182
-            MENU_ITEM(gcode, MSG_CHANGE_SDCARD, PSTR("M21"));  // SD-card changed by user
183
-          #endif
181
+          MENU_ITEM(gcode,
182
+            #if PIN_EXISTS(SD_DETECT)
183
+              MSG_CHANGE_SDCARD, PSTR("M21")
184
+            #else
185
+              MSG_RELEASE_SDCARD, PSTR("M22")
186
+            #endif
187
+          );
184
         }
188
         }
185
       }
189
       }
186
       else {
190
       else {
187
-        #if !PIN_EXISTS(SD_DETECT)
188
-          MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21")); // Manually init SD-card
191
+        #if PIN_EXISTS(SD_DETECT)
192
+          MENU_ITEM(function, MSG_NO_CARD, NULL);
193
+        #else
194
+          MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21"));
195
+          MENU_ITEM(function, MSG_SD_RELEASED, NULL);
189
         #endif
196
         #endif
190
-        MENU_ITEM(function, MSG_NO_CARD, NULL);
191
       }
197
       }
192
     #endif // !HAS_ENCODER_WHEEL && SDSUPPORT
198
     #endif // !HAS_ENCODER_WHEEL && SDSUPPORT
193
 
199
 
259
     if (card_detected) {
265
     if (card_detected) {
260
       if (!card_open) {
266
       if (!card_open) {
261
         MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
267
         MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
262
-        #if !PIN_EXISTS(SD_DETECT)
263
-          MENU_ITEM(gcode, MSG_CHANGE_SDCARD, PSTR("M21"));  // SD-card changed by user
264
-        #endif
268
+        MENU_ITEM(gcode,
269
+          #if PIN_EXISTS(SD_DETECT)
270
+            MSG_CHANGE_SDCARD, PSTR("M21")
271
+          #else
272
+            MSG_RELEASE_SDCARD, PSTR("M22")
273
+          #endif
274
+        );
265
       }
275
       }
266
     }
276
     }
267
     else {
277
     else {
268
-      #if !PIN_EXISTS(SD_DETECT)
269
-        MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21")); // Manually init SD-card
278
+      #if PIN_EXISTS(SD_DETECT)
279
+        MENU_ITEM(function, MSG_NO_CARD, NULL);
280
+      #elif
281
+        MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21"));
282
+        MENU_ITEM(function, MSG_SD_RELEASED, NULL);
270
       #endif
283
       #endif
271
-      MENU_ITEM(function, MSG_NO_CARD, NULL);
272
     }
284
     }
273
   #endif // HAS_ENCODER_WHEEL && SDSUPPORT
285
   #endif // HAS_ENCODER_WHEEL && SDSUPPORT
274
 
286
 

Loading…
Cancel
Save