bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 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

2
Marlin/src/lcd/menu/menu.h
View File

@ -351,7 +351,7 @@ void menu_main();
void menu_move();
#if ENABLED(SDSUPPORT)
void menu_sdcard();
void menu_media();
#endif
// First Fan Speed title in "Tune" and "Control>Temperature" menus

2
Marlin/src/lcd/menu/menu_advanced.cpp
View File

@ -699,7 +699,7 @@ void menu_advanced_settings() {
#if ENABLED(SD_FIRMWARE_UPDATE)
bool sd_update_state = settings.sd_update_status();
MENU_ITEM_EDIT_CALLBACK(bool, MSG_SD_UPDATE, &sd_update_state, []{
MENU_ITEM_EDIT_CALLBACK(bool, MSG_MEDIA_UPDATE, &sd_update_state, []{
//
// Toggle the SD Firmware Update state in EEPROM
//

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

8
Marlin/src/lcd/menu/menu_sdcard.cpp → Marlin/src/lcd/menu/menu_media.cpp
View File

@ -62,7 +62,7 @@ void lcd_sd_updir() {
// ui.drawing_screen = screen_changed = true;
//#endif
goto_screen(menu_sdcard, sd_encoder_position, sd_top_line, sd_items);
goto_screen(menu_media, sd_encoder_position, sd_top_line, sd_items);
sd_encoder_position = 0xFFFF;
defer_status_screen();
@ -122,7 +122,7 @@ class MenuItem_sdfolder {
}
};
void menu_sdcard() {
void menu_media() {
ui.encoder_direction_menus();
const uint16_t fileCnt = card.get_num_Files();
@ -149,9 +149,9 @@ void menu_sdcard() {
card.getfilename_sorted(nr);
if (card.flag.filenameIsDir)
MENU_ITEM(sdfolder, MSG_CARD_MENU, card);
MENU_ITEM(sdfolder, MSG_MEDIA_MENU, card);
else
MENU_ITEM(sdfile, MSG_CARD_MENU, card);
MENU_ITEM(sdfile, MSG_MEDIA_MENU, card);
}
else {
MENU_ITEM_DUMMY();