sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"SD card" => "Media" (#14951)

Browse Source
This commit is contained in:
Marcio Teixeira
2019-08-14 16:52:14 -06:00
committed by Scott Lahteine
parent 24ce8beb48
commit 263d7d37af
33 changed files with 220 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,22 +126,22 @@ void menu_main() {
if (card_detected) {
if (!card_open) {
MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
MENU_ITEM(submenu, MSG_MEDIA_MENU, menu_media);
MENU_ITEM(gcode,
#if PIN_EXISTS(SD_DETECT)
MSG_CHANGE_SDCARD, PSTR("M21")
MSG_CHANGE_MEDIA, PSTR("M21")
#else
MSG_RELEASE_SDCARD, PSTR("M22")
MSG_RELEASE_MEDIA, PSTR("M22")
#endif
);
}
}
else {
#if PIN_EXISTS(SD_DETECT)
MENU_ITEM(function, MSG_NO_CARD, nullptr);
MENU_ITEM(function, MSG_NO_MEDIA, nullptr);
#else
MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21"));
MENU_ITEM(function, MSG_SD_RELEASED, nullptr);
MENU_ITEM(gcode, MSG_INIT_MEDIA, PSTR("M21"));
MENU_ITEM(function, MSG_MEDIA_RELEASED, nullptr);
#endif
}
#endif // !HAS_ENCODER_WHEEL && SDSUPPORT
@ -219,20 +219,20 @@ void menu_main() {
if (!card_open) {
MENU_ITEM(gcode,
#if PIN_EXISTS(SD_DETECT)
MSG_CHANGE_SDCARD, PSTR("M21")
MSG_CHANGE_MEDIA, PSTR("M21")
#else
MSG_RELEASE_SDCARD, PSTR("M22")
MSG_RELEASE_MEDIA, PSTR("M22")
#endif
);
MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
MENU_ITEM(submenu, MSG_MEDIA_MENU, menu_media);
}
}
else {
#if PIN_EXISTS(SD_DETECT)
MENU_ITEM(function, MSG_NO_CARD, nullptr);
MENU_ITEM(function, MSG_NO_MEDIA, nullptr);
#else
MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21"));
MENU_ITEM(function, MSG_SD_RELEASED, nullptr);
MENU_ITEM(gcode, MSG_INIT_MEDIA, PSTR("M21"));
MENU_ITEM(function, MSG_MEDIA_RELEASED, nullptr);
#endif
}
#endif // HAS_ENCODER_WHEEL && SDSUPPORT