zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Add SD Release when no SD_DETECT_PIN exists (#13857)

Browse source
This commit is contained in:
Clinton James 2019-05-01 18:00:21 +12:00 committed by Scott Lahteine
parent 39ebca6b5f
commit 2740cc64d8
2 changed files with 30 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/src/lcd/language/language_en.h
View file

@ -67,6 +67,9 @@
#ifndef MSG_SD_REMOVED #ifndef MSG_SD_REMOVED
#define MSG_SD_REMOVED _UxGT("Card removed") #define MSG_SD_REMOVED _UxGT("Card removed")
#endif #endif
#ifndef MSG_SD_RELEASED
#define MSG_SD_RELEASED _UxGT("Card released")
#endif
#ifndef MSG_LCD_ENDSTOPS #ifndef MSG_LCD_ENDSTOPS
#define MSG_LCD_ENDSTOPS _UxGT("Endstops") // Max length 8 characters #define MSG_LCD_ENDSTOPS _UxGT("Endstops") // Max length 8 characters
#endif #endif
@ -879,6 +882,9 @@
#ifndef MSG_CHANGE_SDCARD #ifndef MSG_CHANGE_SDCARD
#define MSG_CHANGE_SDCARD _UxGT("Change SD card") #define MSG_CHANGE_SDCARD _UxGT("Change SD card")
#endif #endif
#ifndef MSG_RELEASE_SDCARD
#define MSG_RELEASE_SDCARD _UxGT("Release SD card")
#endif
#ifndef MSG_ZPROBE_OUT #ifndef MSG_ZPROBE_OUT
#define MSG_ZPROBE_OUT _UxGT("Z Probe past bed") #define MSG_ZPROBE_OUT _UxGT("Z Probe past bed")
#endif #endif

36
Marlin/src/lcd/menu/menu_main.cpp
View file

@ -178,16 +178,22 @@ void menu_main() {
if (card_detected) { if (card_detected) {
if (!card_open) { if (!card_open) {
MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard); MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
#if !PIN_EXISTS(SD_DETECT) MENU_ITEM(gcode,
MENU_ITEM(gcode, MSG_CHANGE_SDCARD, PSTR("M21")); // SD-card changed by user #if PIN_EXISTS(SD_DETECT)
#endif MSG_CHANGE_SDCARD, PSTR("M21")
#else
MSG_RELEASE_SDCARD, PSTR("M22")
#endif
);
} }
} }
else { else {
#if !PIN_EXISTS(SD_DETECT) #if PIN_EXISTS(SD_DETECT)
MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21")); // Manually init SD-card MENU_ITEM(function, MSG_NO_CARD, NULL);
#else
MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21"));
MENU_ITEM(function, MSG_SD_RELEASED, NULL);
#endif #endif
MENU_ITEM(function, MSG_NO_CARD, NULL);
} }
#endif // !HAS_ENCODER_WHEEL && SDSUPPORT #endif // !HAS_ENCODER_WHEEL && SDSUPPORT
@ -259,16 +265,22 @@ void menu_main() {
if (card_detected) { if (card_detected) {
if (!card_open) { if (!card_open) {
MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard); MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
#if !PIN_EXISTS(SD_DETECT) MENU_ITEM(gcode,
MENU_ITEM(gcode, MSG_CHANGE_SDCARD, PSTR("M21")); // SD-card changed by user #if PIN_EXISTS(SD_DETECT)
#endif MSG_CHANGE_SDCARD, PSTR("M21")
#else
MSG_RELEASE_SDCARD, PSTR("M22")
#endif
);
} }
} }
else { else {
#if !PIN_EXISTS(SD_DETECT) #if PIN_EXISTS(SD_DETECT)
MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21")); // Manually init SD-card MENU_ITEM(function, MSG_NO_CARD, NULL);
#elif
MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21"));
MENU_ITEM(function, MSG_SD_RELEASED, NULL);
#endif #endif
MENU_ITEM(function, MSG_NO_CARD, NULL);
} }
#endif // HAS_ENCODER_WHEEL && SDSUPPORT #endif // HAS_ENCODER_WHEEL && SDSUPPORT