bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 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
Download Patch File Download Diff File Expand all files Collapse all files

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

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