bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🩹 Media Change followup (#24302)

Browse Source 
Followup to #24015
This commit is contained in:
ellensp
2022-06-07 18:59:21 +12:00
committed by Scott Lahteine
parent 85e8d1f9fa
commit 48d03ca0a9
11 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
View File

@ -86,7 +86,7 @@ void AnycubicTFTClass::OnSetup() {
delay_ms(10);
// Init the state of the key pins running on the TFT
#if ENABLED(SDSUPPORT) && PIN_EXISTS(SD_DETECT)
#if BOTH(SDSUPPORT, HAS_SD_DETECT)
SET_INPUT_PULLUP(SD_DETECT_PIN);
#endif
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
@ -916,7 +916,7 @@ void AnycubicTFTClass::GetCommandFromTFT() {
}
void AnycubicTFTClass::DoSDCardStateCheck() {
#if ENABLED(SDSUPPORT) && PIN_EXISTS(SD_DETECT)
#if BOTH(SDSUPPORT, HAS_SD_DETECT)
bool isInserted = isMediaInserted();
if (isInserted)
SENDLINE_DBG_PGM("J00", "TFT Serial Debug: SD card state changed... isInserted");

4
Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
View File

@ -47,9 +47,7 @@ void DGUSRxHandler::ScreenChange(DGUS_VP &vp, void *data_ptr) {
if (vp.addr == DGUS_Addr::SCREENCHANGE_SD) {
#if ENABLED(SDSUPPORT)
#if !PIN_EXISTS(SD_DETECT)
card.mount();
#endif
IF_DISABLED(HAS_SD_DETECT, card.mount());
if (!ExtUI::isMediaInserted()) {
dgus_screen_handler.SetStatusMessage(GET_TEXT_F(MSG_NO_MEDIA));

3
Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
View File

@ -137,8 +137,7 @@ void tft_lvgl_init() {
uint16_t usb_flash_loop = 1000;
#if ENABLED(MULTI_VOLUME) && !HAS_SD_HOST_DRIVE
SET_INPUT_PULLUP(SD_DETECT_PIN);
if (READ(SD_DETECT_PIN) == LOW) card.changeMedia(&card.media_driver_sdcard);
else card.changeMedia(&card.media_driver_usbFlash);
card.changeMedia(IS_SD_INSERTED() ? &card.media_driver_sdcard : &card.media_driver_usbFlash);
#endif
do {
card.media_driver_usbFlash.idle();

2
Marlin/src/lcd/marlinui.cpp
View File

@ -1756,7 +1756,7 @@ void MarlinUI::init() {
if (old_status < 2) {
#if ENABLED(EXTENSIBLE_UI)
ExtUI::onMediaRemoved();
#elif PIN_EXISTS(SD_DETECT)
#elif HAS_SD_DETECT
LCD_MESSAGE(MSG_MEDIA_REMOVED);
#if HAS_MARLINUI_MENU
if (!defer_return_to_status) return_to_status();

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

@ -246,7 +246,7 @@ void menu_main() {
if (card_detected) {
if (!card_open) {
#if PIN_EXISTS(SD_DETECT)
#if HAS_SD_DETECT
GCODES_ITEM(MSG_CHANGE_MEDIA, F("M21")); // M21 Change Media
#else // - or -
ACTION_ITEM(MSG_RELEASE_MEDIA, []{ // M22 Release Media
@ -262,7 +262,7 @@ void menu_main() {
}
}
else {
#if PIN_EXISTS(SD_DETECT)
#if HAS_SD_DETECT
ACTION_ITEM(MSG_NO_MEDIA, nullptr); // "No Media"
#else
GCODES_ITEM(MSG_ATTACH_MEDIA, F("M21")); // M21 Attach Media

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

@ -122,7 +122,7 @@ void menu_media_filelist() {
BACK_ITEM_F(TERN1(BROWSE_MEDIA_ON_INSERT, screen_history_depth) ? GET_TEXT_F(MSG_MAIN) : GET_TEXT_F(MSG_BACK));
#endif
if (card.flag.workDirIsRoot) {
#if !PIN_EXISTS(SD_DETECT)
#if !HAS_SD_DETECT
ACTION_ITEM(MSG_REFRESH, []{ encoderTopLine = 0; card.mount(); });
#endif
}