MarlinFirmware · thinkyhead · Apr 29, 2025 · Apr 24, 2025 · Apr 24, 2025 · Apr 26, 2025
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
@@ -1960,7 +1960,8 @@
   #if ENABLED(MULTI_VOLUME)
     #define VOLUME_SD_ONBOARD
     #define VOLUME_USB_FLASH_DRIVE
-    #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
+    #define DEFAULT_VOLUME        SD_ONBOARD       // :[ 'SD_ONBOARD', 'USB_FLASH_DRIVE' ]
+    #define DEFAULT_SHARED_VOLUME USB_FLASH_DRIVE  // :[ 'SD_ONBOARD', 'USB_FLASH_DRIVE' ]
   #endif
 
 #endif // HAS_MEDIA

diff --git a/Marlin/src/HAL/STM32/sd/msc_sd.cpp b/Marlin/src/HAL/STM32/sd/msc_sd.cpp
@@ -48,6 +48,7 @@
 class Sd2CardUSBMscHandler : public USBMscHandler {
 public:
   DiskIODriver* diskIODriver() {
+    // TODO: Explore a variable shared volume, or auto share the un-mounted volume(s)
     #if HAS_MULTI_VOLUME
       #if SHARED_VOLUME_IS(SD_ONBOARD)
         return &card.media_driver_sdcard;

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
@@ -1349,8 +1349,11 @@ void setup() {
     #endif
   #endif
 
-  #if HAS_MEDIA && ANY(SDCARD_EEPROM_EMULATION, POWER_LOSS_RECOVERY)
-    SETUP_RUN(card.mount());          // Mount media with settings before first_load
+  #if HAS_MEDIA
+    SETUP_RUN(card.init());           // Prepare for media usage
+    #if ANY(SDCARD_EEPROM_EMULATION, POWER_LOSS_RECOVERY)
+      SETUP_RUN(card.mount());        // Mount media with settings before first_load
+    #endif
   #endif
 
   // Prepare some LCDs to display early

diff --git a/Marlin/src/feature/password/password.cpp b/Marlin/src/feature/password/password.cpp
@@ -36,7 +36,7 @@ uint32_t Password::value, Password::value_entry;
 
 //
 // Authenticate user with password.
-// Called from Setup, after SD Prinitng Stops/Aborts, and M510
+// Called from Setup, after SD Printing Stops/Aborts, and M510
 //
 void Password::lock_machine() {
   is_locked = true;

diff --git a/Marlin/src/feature/password/password.h b/Marlin/src/feature/password/password.h
@@ -37,6 +37,8 @@ class Password {
     static void access_menu_password();
     static void authentication_done();
     static void media_gatekeeper();
+    static void media_gatekeeper_sd();
+    static void media_gatekeeper_usb();
 
     private:
     static void authenticate_user(const screenFunc_t, const screenFunc_t);

diff --git a/Marlin/src/inc/Changes.h b/Marlin/src/inc/Changes.h
@@ -799,3 +799,31 @@
 #undef _POWERSTEP01
 #undef _TMC26X
 #undef _TMC26X_STANDALONE
+
+#if ENABLED(MULTI_VOLUME)
+  // Change to a generic ID without SV_ prefix
+  #define SV_SD_ONBOARD      201
+  #define SV_USB_FLASH_DRIVE 202
+  #if DEFAULT_VOLUME_IS(SV_SD_ONBOARD) || SHARED_VOLUME_IS(SV_SD_ONBOARD)
+    #error "SV_SD_ONBOARD is now SD_ONBOARD."
+  #elif DEFAULT_VOLUME_IS(SV_USB_FLASH_DRIVE) || SHARED_VOLUME_IS(SV_USB_FLASH_DRIVE)
+    #error "SV_USB_FLASH_DRIVE is now USB_FLASH_DRIVE."
+  #endif
+  // Skip less clear "bad value" errors in inc/SanityCheck.h
+  #if DEFAULT_VOLUME_IS(SV_SD_ONBOARD)
+    #undef DEFAULT_VOLUME
+    #define DEFAULT_VOLUME SD_ONBOARD
+  #elif DEFAULT_VOLUME_IS(SV_USB_FLASH_DRIVE)
+    #undef DEFAULT_VOLUME
+    #define DEFAULT_VOLUME USB_FLASH_DRIVE
+  #endif
+  #if SHARED_VOLUME_IS(SV_SD_ONBOARD)
+    #undef DEFAULT_SHARED_VOLUME
+    #define DEFAULT_SHARED_VOLUME SD_ONBOARD
+  #elif SHARED_VOLUME_IS(SV_USB_FLASH_DRIVE)
+    #undef DEFAULT_SHARED_VOLUME
+    #define DEFAULT_SHARED_VOLUME USB_FLASH_DRIVE
+  #endif
+  #undef SV_SD_ONBOARD
+  #undef SV_USB_FLASH_DRIVE
+#endif
diff --git a/Marlin/src/inc/Conditionals-4-adv.h b/Marlin/src/inc/Conditionals-4-adv.h
@@ -1248,11 +1248,12 @@
 
 #if ENABLED(MULTI_VOLUME)
   #define HAS_MULTI_VOLUME 1
-  #define SV_SD_ONBOARD      101
-  #define SV_USB_FLASH_DRIVE 102
-  #define _VOLUME_ID(N) _CAT(SV_, N)
-  #define SHARED_VOLUME_IS(N) (DEFAULT_SHARED_VOLUME == _VOLUME_ID(N))
+  #define SD_ONBOARD      101
+  #define USB_FLASH_DRIVE 102
+  #define DEFAULT_VOLUME_IS(N) (DEFAULT_VOLUME == N)
+  #define SHARED_VOLUME_IS(N) (DEFAULT_SHARED_VOLUME == N)
 #else
+  #define DEFAULT_VOLUME_IS(...) 0
   #define SHARED_VOLUME_IS(...) 0
 #endif
 

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
@@ -416,10 +416,20 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
 /**
  * SD Card Settings
  */
-#if ALL(HAS_MEDIA, HAS_SD_DETECT, SD_CONNECTION_TYPICAL, ELB_FULL_GRAPHIC_CONTROLLER, HAS_MARLINUI_MENU) && SD_DETECT_STATE == LOW
-  #error "SD_DETECT_STATE must be set HIGH for SD on the ELB_FULL_GRAPHIC_CONTROLLER."
+#if HAS_MEDIA
+  #if HAS_MULTI_VOLUME
+    #if !(DEFAULT_VOLUME_IS(SD_ONBOARD) || DEFAULT_VOLUME_IS(USB_FLASH_DRIVE))
+      #error "DEFAULT_VOLUME must be either SD_ONBOARD or USB_FLASH_DRIVE."
+    #endif
+    #if !(SHARED_VOLUME_IS(SD_ONBOARD) || SHARED_VOLUME_IS(USB_FLASH_DRIVE))
+      #error "DEFAULT_SHARED_VOLUME must be either SD_ONBOARD or USB_FLASH_DRIVE."
+    #endif
+  #endif
+  #if ALL(ELB_FULL_GRAPHIC_CONTROLLER, HAS_MARLINUI_MENU, SD_CONNECTION_TYPICAL, HAS_SD_DETECT) && SD_DETECT_STATE == LOW
+    #error "SD_DETECT_STATE must be set HIGH for SD on the ELB_FULL_GRAPHIC_CONTROLLER."
+  #endif
+  #undef SD_CONNECTION_TYPICAL
 #endif
-#undef SD_CONNECTION_TYPICAL
 
 /**
  * SD File Sorting

diff --git a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
@@ -175,9 +175,9 @@ void TFTGLCD::clr_screen() {
     SPI_SEND_ONE(CLR_SCREEN);
     WRITE(TFTGLCD_CS, HIGH);
   #else
-    Wire.beginTransmission(uint8_t(LCD_I2C_ADDRESS));  //set I2C device address
+    Wire.beginTransmission(uint8_t(LCD_I2C_ADDRESS)); // Transmit to LCD via I2C
     Wire.write(CLR_SCREEN);
-    Wire.endTransmission(); //transmit data
+    Wire.endTransmission();                           // Send the data
   #endif
 }
 
@@ -378,10 +378,6 @@ void MarlinUI::clear_for_drawing() { clear_lcd(); }
   void MarlinUI::_set_contrast() { lcd.setContrast(contrast); }
 #endif
 
-#if !IS_TFTGLCD_PANEL
-  void lcd_moveto(const uint8_t col, const uint8_t row) { lcd.setCursor(col, row); }
-#endif
-
 static void center_text(FSTR_P const fstart, const uint8_t y) {
   const uint8_t len = utf8_strlen(fstart);
   lcd_moveto(len < LCD_WIDTH ? (LCD_WIDTH - len) / 2 : 0, y);

diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
@@ -740,7 +740,7 @@ void ChironTFT::panelAction(uint8_t req) {
       break;
 
     case 26:   // A26 Refresh SD
-      if (card.isMounted())card.release();
+      card.release();
       card.mount();
       safe_delay(500);
       filenavigator.reset();

diff --git a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
@@ -131,32 +131,16 @@ void tft_lvgl_init() {
   // Init TFT first!
   SPI_TFT.spiInit(SPI_FULL_SPEED);
   SPI_TFT.lcdInit();
-
   hal.watchdog_refresh();     // LVGL init takes time
 
-  #if HAS_USB_FLASH_DRIVE
-    #if HAS_MULTI_VOLUME && !HAS_SD_HOST_DRIVE
-      if (card.isSDCardInserted())
-        card.selectMediaSDCard();
-      else
-        card.selectMediaFlashDrive();
-    #endif
-    // Wait up to two seconds for USB Drive to mount
-    for (uint16_t usb_flash_loop = 500; --usb_flash_loop;) {
-      hal.watchdog_refresh();
-      card.media_driver_usbFlash.idle();
-      delay(4);
-      if (card.media_driver_usbFlash.isInserted()) break;
-    }
-    card.mount();
-  #elif HAS_LOGO_IN_FLASH
+  #if HAS_LOGO_IN_FLASH
+    // Leave the boot screen visible for a moment
     delay(1000);
-    hal.watchdog_refresh();
+    hal.watchdog_refresh();     // LVGL init takes time
     delay(1000);
+    hal.watchdog_refresh();     // LVGL init takes time
   #endif
 
-  hal.watchdog_refresh();     // LVGL init takes time
-
   #if HAS_MEDIA
     UpdateAssets();
     hal.watchdog_refresh();   // LVGL init takes time

diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
@@ -574,10 +574,8 @@ namespace LanguageNarrow_en {
   LSTR MSG_CANCEL_OBJECT                  = _UxGT("Cancel Obj");
   LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Cancel Obj {");
   LSTR MSG_CONTINUE_PRINT_JOB             = _UxGT("Continue Job");
-  LSTR MSG_MEDIA_MENU                     = MEDIA_TYPE_EN _UxGT(" Print");
   LSTR MSG_TURN_OFF                       = _UxGT("Turn off now");
   LSTR MSG_END_LOOPS                      = _UxGT("End Loops");
-  LSTR MSG_NO_MEDIA                       = _UxGT("No ") MEDIA_TYPE_EN;
   LSTR MSG_DWELL                          = _UxGT("Sleep...");
   LSTR MSG_USERWAIT                       = _UxGT("Click to Resume...");
   LSTR MSG_PRINT_PAUSED                   = _UxGT("Print Paused");
@@ -641,6 +639,10 @@ namespace LanguageNarrow_en {
   LSTR MSG_RUN_AUTOFILES                  = _UxGT("Run Autofiles");
   LSTR MSG_RUN_AUTOFILES_SD               = _UxGT("Run SD Autofiles");
   LSTR MSG_RUN_AUTOFILES_USB              = _UxGT("Run USB Autofiles");
+  LSTR MSG_MEDIA_MENU                     = MEDIA_TYPE_EN _UxGT(" Print");
+  LSTR MSG_MEDIA_MENU_SD                  = _UxGT("Select from SD");
+  LSTR MSG_MEDIA_MENU_USB                 = _UxGT("Select from USB");
+  LSTR MSG_NO_MEDIA                       = _UxGT("No ") MEDIA_TYPE_EN _UxGT(" Detected");
 
   LSTR MSG_ZPROBE_OUT                     = _UxGT("Z Probe Past Bed");
   LSTR MSG_SKEW_FACTOR                    = _UxGT("Skew Factor");
@@ -1130,6 +1132,9 @@ namespace LanguageWide_en {
     LSTR MSG_CANCEL_OBJECT_N              = _UxGT("Cancel Object {");
     LSTR MSG_CONTINUE_PRINT_JOB           = _UxGT("Continue Print Job");
     LSTR MSG_MEDIA_MENU                   = _UxGT("Select from ") MEDIA_TYPE_EN;
+    LSTR MSG_MEDIA_MENU_SD                = _UxGT("Select from SD Card");
+    LSTR MSG_MEDIA_MENU_USB               = _UxGT("Select from USB Drive");
+    LSTR MSG_NO_MEDIA                     = _UxGT("No ") MEDIA_TYPE_EN _UxGT(" Found");
     LSTR MSG_TURN_OFF                     = _UxGT("Turn off the printer");
     LSTR MSG_END_LOOPS                    = _UxGT("End Repeat Loops");
     LSTR MSG_MEDIA_NOT_INSERTED           = _UxGT("No media inserted.");          // ProUI

diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
@@ -1891,40 +1891,60 @@ uint8_t expand_u8str_P(char * const outstr, PGM_P const ptpl, const int8_t ind,
     #include "extui/ui_api.h"
   #endif
 
-  void MarlinUI::media_changed(const uint8_t old_status, const uint8_t status) {
+  void MarlinUI::media_changed(const MediaPresence old_status, const MediaPresence status) {
     TERN_(HAS_DISPLAY_SLEEP, refresh_screen_timeout());
     if (old_status == status) {
       TERN_(EXTENSIBLE_UI, ExtUI::onMediaError()); // Failed to mount/unmount
       return;
     }
 
-    if (old_status < 2) {   // Skip this section on first boot check
-      if (status) {         // Media Mounted
+    if (old_status > MEDIA_BOOT) {  // Skip this section on first boot check
+
+      if (status > old_status) {    // Media Mounted
+
         #if ENABLED(EXTENSIBLE_UI)
+
           ExtUI::onMediaMounted();
+
         #elif ENABLED(BROWSE_MEDIA_ON_INSERT)
+
           clear_menu_history();
           quick_feedback();
           goto_screen(MEDIA_MENU_GATEWAY);
+
         #else
+
           if (card.isSDCardSelected())
             LCD_MESSAGE(MSG_MEDIA_INSERTED_SD);
           else if (card.isFlashDriveSelected())
             LCD_MESSAGE(MSG_MEDIA_INSERTED_USB);
           else
             LCD_MESSAGE(MSG_MEDIA_INSERTED);
+
         #endif
       }
       else {                // Media Removed
+
         #if ENABLED(EXTENSIBLE_UI)
+
           ExtUI::onMediaRemoved();
-        #elif HAS_SD_DETECT // Q: Does "Media Removed" need to be shown for manual release too?
-          LCD_MESSAGE(MSG_MEDIA_REMOVED);
-          #if HAS_MARLINUI_MENU
-            if (ENABLED(HAS_WIRED_LCD) || !defer_return_to_status) return_to_status();
-          #endif
+
+        #elif HAS_SD_DETECT || HAS_USB_FLASH_DRIVE // Q: Does "Media Removed" need to be shown for manual release too?
+
+          if ((old_status ^ status) & INSERT_SD)
+            LCD_MESSAGE(MSG_MEDIA_REMOVED_SD);
+          else if ((old_status ^ status) & INSERT_USB)
+            LCD_MESSAGE(MSG_MEDIA_REMOVED_USB);
+          else
+            LCD_MESSAGE(MSG_MEDIA_REMOVED);
+
+          if (ENABLED(HAS_WIRED_LCD) || !defer_return_to_status)
+            return_to_status();
+
         #elif HAS_WIRED_LCD
+
           return_to_status();
+
         #endif
       }
     }

diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
@@ -255,8 +255,10 @@ class MarlinUI {
   #endif
 
   #if HAS_MEDIA
-    #define MEDIA_MENU_GATEWAY TERN(PASSWORD_ON_SD_PRINT_MENU, password.media_gatekeeper, menu_media)
-    static void media_changed(const uint8_t old_stat, const uint8_t stat);
+    #define MEDIA_MENU_GATEWAY     TERN(PASSWORD_ON_SD_PRINT_MENU, password.media_gatekeeper,     menu_file_selector)
+    #define MEDIA_MENU_GATEWAY_SD  TERN(PASSWORD_ON_SD_PRINT_MENU, password.media_gatekeeper_sd,  menu_file_selector_sd)
+    #define MEDIA_MENU_GATEWAY_USB TERN(PASSWORD_ON_SD_PRINT_MENU, password.media_gatekeeper_usb, menu_file_selector_usb)
+    static void media_changed(const MediaPresence old_stat, const MediaPresence stat);
   #endif
 
   #if HAS_LCD_BRIGHTNESS
@@ -864,7 +866,7 @@ class MarlinUI {
       TERN_(REVERSE_SELECT_DIRECTION, encoderDirection = -(ENCODERBASE));
     }
 
-  #else
+  #else // !HAS_ENCODER_ACTION
 
     static void update_buttons() {}
     static bool hw_button_pressed() { return false; }

diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
@@ -212,7 +212,8 @@ void menu_move();
 
 #if HAS_MEDIA
   void menu_file_selector();
-  void menu_media();
+  void menu_file_selector_sd();
+  void menu_file_selector_usb();
 #endif
 
 ////////////////////////////////////////////

diff --git a/Marlin/src/lcd/menu/menu_item.h b/Marlin/src/lcd/menu/menu_item.h
@@ -226,6 +226,9 @@ class MenuItem_bool : public MenuEditItemBase {
  * should be done before the menu loop (START_MENU / START_SCREEN).
  */
 
+// CAUTION! When using menu items in a lambda or sub-function always use:
+#define INJECT_MENU_ITEMS(FN) { FN; if (ui.screen_changed) return; }
+
 /**
  * SCREEN_OR_MENU_LOOP generates header code for a screen or menu
  *