Skip to content

Commit 057302b

Browse files
rhapsodyvthinkyhead
authored andcommitted
👽️ Fix usb-host-msc-cdc-msc issue (MarlinFirmware#22025)
1 parent d62619c commit 057302b

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

Marlin/src/HAL/STM32/inc/Conditionals_adv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
#pragma once
2323

24-
#if defined(USBD_USE_CDC_MSC) && DISABLED(NO_SD_HOST_DRIVE)
24+
#if BOTH(SDSUPPORT, USBD_USE_CDC_MSC) && DISABLED(NO_SD_HOST_DRIVE)
2525
#define HAS_SD_HOST_DRIVE 1
2626
#endif
2727

buildroot/share/PlatformIO/scripts/generic_create_variant.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
else:
2929
platform_name = PackageSpec(platform_packages[0]).name
3030

31-
if platform_name in [ "usb-host-msc", "usb-host-msc-cdc-msc", "tool-stm32duino" ]:
31+
if platform_name in [ "usb-host-msc", "usb-host-msc-cdc-msc", "usb-host-msc-cdc-msc-2", "tool-stm32duino" ]:
3232
platform_name = "framework-arduinoststm32"
3333

3434
FRAMEWORK_DIR = platform.get_package_dir(platform_name)

ini/stm32f1.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ board_upload.offset_address = 0x08007000
171171
[env:STM32F103RC_btt_USB_stm32]
172172
extends = env:STM32F103RC_btt_stm32
173173
platform = ${common_stm32.platform}
174-
platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc.zip
174+
platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-2.zip
175175
build_unflags = ${common_stm32.build_unflags} -DUSBD_USE_CDC
176176
build_flags = ${env:STM32F103RC_btt_stm32.build_flags} ${env:stm32_flash_drive.build_flags}
177177
-DUSBCON

ini/stm32f4.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ debug_init_break =
160160
# USB Flash Drive mix-ins for STM32
161161
#
162162
[stm_flash_drive]
163-
platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc.zip
163+
platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-2.zip
164164
build_flags = ${common_stm32.build_flags}
165165
-DHAL_PCD_MODULE_ENABLED -DHAL_HCD_MODULE_ENABLED
166166
-DUSBHOST -DUSBH_IRQ_PRIO=3 -DUSBH_IRQ_SUBPRIO=4
@@ -438,7 +438,7 @@ build_flags = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags}
438438
[env:mks_robin_nano_v3_usb_flash_drive_msc]
439439
platform = ${common_stm32.platform}
440440
extends = env:mks_robin_nano_v3
441-
platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc.zip
441+
platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-2.zip
442442
build_unflags = ${common_stm32.build_unflags} -DUSBD_USE_CDC
443443
build_flags = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags}
444444
-DUSBCON

0 commit comments

Comments
 (0)