From d434729da6ea38295fed76a23603767439b22e06 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 20 Apr 2025 19:25:12 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=F0=9F=94=A7=20Move=20extra=20volum?= =?UTF-8?q?e=20flags?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/inc/Conditionals-2-LCD.h | 6 ------ Marlin/src/inc/Conditionals-4-adv.h | 10 ++++++++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Marlin/src/inc/Conditionals-2-LCD.h b/Marlin/src/inc/Conditionals-2-LCD.h index 633cd2beb6..2bf663b6f0 100644 --- a/Marlin/src/inc/Conditionals-2-LCD.h +++ b/Marlin/src/inc/Conditionals-2-LCD.h @@ -36,12 +36,6 @@ #if ENABLED(SDSUPPORT) #define HAS_MEDIA 1 #endif -#if ENABLED(MULTI_VOLUME) - #define HAS_MULTI_VOLUME 1 -#endif -#if ENABLED(USB_FLASH_DRIVE_SUPPORT) - #define HAS_USB_FLASH_DRIVE 1 -#endif // // Serial Port Info diff --git a/Marlin/src/inc/Conditionals-4-adv.h b/Marlin/src/inc/Conditionals-4-adv.h index ca096c7661..3b01077931 100644 --- a/Marlin/src/inc/Conditionals-4-adv.h +++ b/Marlin/src/inc/Conditionals-4-adv.h @@ -1246,8 +1246,14 @@ #define HOMING_BUMP_MM { 0, 0, 0 } #endif -#if HAS_USB_FLASH_DRIVE && NONE(USE_OTG_USB_HOST, USE_UHS3_USB) - #define USE_UHS2_USB +#if ENABLED(MULTI_VOLUME) + #define HAS_MULTI_VOLUME 1 +#endif +#if ENABLED(USB_FLASH_DRIVE_SUPPORT) + #define HAS_USB_FLASH_DRIVE 1 + #if NONE(USE_OTG_USB_HOST, USE_UHS3_USB) + #define USE_UHS2_USB + #endif #endif /**