From 1c98a8e8936330fd17ae31bb6798de627f472184 Mon Sep 17 00:00:00 2001 From: Victor Mateus Oliveira Date: Thu, 3 Jun 2021 01:06:31 -0300 Subject: [PATCH 1/4] update repo to use the usb fixed name --- ini/stm32f1.ini | 2 +- ini/stm32f4.ini | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini index 4c42922452bc..e8e5d5688657 100644 --- a/ini/stm32f1.ini +++ b/ini/stm32f1.ini @@ -69,7 +69,7 @@ board_upload.offset_address = 0x08007000 [env:STM32F103RC_btt_USB] extends = env:STM32F103RC_btt platform = ${common_stm32.platform} -platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc.zip +platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/refs/heads/usb-host-msc-cdc-msc-2.zip build_unflags = ${common_stm32.build_unflags} -DUSBD_USE_CDC build_flags = ${env:STM32F103RC_btt.build_flags} ${env:stm32_flash_drive.build_flags} -DUSBCON diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini index 087a446ede4a..f393abd71a19 100644 --- a/ini/stm32f4.ini +++ b/ini/stm32f4.ini @@ -146,7 +146,7 @@ debug_init_break = # USB Flash Drive mix-ins for STM32 # [stm_flash_drive] -platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc.zip +platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/refs/heads/usb-host-msc-cdc-msc-2.zip build_flags = ${common_stm32.build_flags} -DHAL_PCD_MODULE_ENABLED -DHAL_HCD_MODULE_ENABLED -DUSBHOST -DUSBH_IRQ_PRIO=3 -DUSBH_IRQ_SUBPRIO=4 @@ -424,7 +424,7 @@ build_flags = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags} [env:mks_robin_nano_v3_usb_flash_drive_msc] platform = ${common_stm32.platform} extends = env:mks_robin_nano_v3 -platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc.zip +platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/refs/heads/usb-host-msc-cdc-msc-2.zip build_unflags = ${common_stm32.build_unflags} -DUSBD_USE_CDC build_flags = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags} -DUSBCON From 2956a2b514165a2fc19f59cd210d0bd8120168b5 Mon Sep 17 00:00:00 2001 From: Victor Mateus Oliveira Date: Thu, 3 Jun 2021 14:48:38 -0300 Subject: [PATCH 2/4] fix links --- ini/stm32f1.ini | 2 +- ini/stm32f4.ini | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini index e8e5d5688657..c6aa464979f5 100644 --- a/ini/stm32f1.ini +++ b/ini/stm32f1.ini @@ -69,7 +69,7 @@ board_upload.offset_address = 0x08007000 [env:STM32F103RC_btt_USB] extends = env:STM32F103RC_btt platform = ${common_stm32.platform} -platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/refs/heads/usb-host-msc-cdc-msc-2.zip +platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-2.zip build_unflags = ${common_stm32.build_unflags} -DUSBD_USE_CDC build_flags = ${env:STM32F103RC_btt.build_flags} ${env:stm32_flash_drive.build_flags} -DUSBCON diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini index f393abd71a19..d730387cb996 100644 --- a/ini/stm32f4.ini +++ b/ini/stm32f4.ini @@ -146,7 +146,7 @@ debug_init_break = # USB Flash Drive mix-ins for STM32 # [stm_flash_drive] -platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/refs/heads/usb-host-msc-cdc-msc-2.zip +platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-2.zip build_flags = ${common_stm32.build_flags} -DHAL_PCD_MODULE_ENABLED -DHAL_HCD_MODULE_ENABLED -DUSBHOST -DUSBH_IRQ_PRIO=3 -DUSBH_IRQ_SUBPRIO=4 @@ -424,7 +424,7 @@ build_flags = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags} [env:mks_robin_nano_v3_usb_flash_drive_msc] platform = ${common_stm32.platform} extends = env:mks_robin_nano_v3 -platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/refs/heads/usb-host-msc-cdc-msc-2.zip +platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-2.zip build_unflags = ${common_stm32.build_unflags} -DUSBD_USE_CDC build_flags = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags} -DUSBCON From 55cb421b6b6b588d88be96fa8849990f34fe771b Mon Sep 17 00:00:00 2001 From: Victor Mateus Oliveira Date: Thu, 3 Jun 2021 14:49:00 -0300 Subject: [PATCH 3/4] update script --- buildroot/share/PlatformIO/scripts/generic_create_variant.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot/share/PlatformIO/scripts/generic_create_variant.py b/buildroot/share/PlatformIO/scripts/generic_create_variant.py index 3290dcea192b..75c62ef70ef7 100644 --- a/buildroot/share/PlatformIO/scripts/generic_create_variant.py +++ b/buildroot/share/PlatformIO/scripts/generic_create_variant.py @@ -28,7 +28,7 @@ else: platform_name = PackageSpec(platform_packages[0]).name -if platform_name in [ "usb-host-msc", "usb-host-msc-cdc-msc", "tool-stm32duino" ]: +if platform_name in [ "usb-host-msc", "usb-host-msc-cdc-msc", "usb-host-msc-cdc-msc-2", "tool-stm32duino" ]: platform_name = "framework-arduinoststm32" FRAMEWORK_DIR = platform.get_package_dir(platform_name) From 67d20be4610e5da3302723ab62c77c58d9b0e2ac Mon Sep 17 00:00:00 2001 From: Victor Mateus Oliveira Date: Thu, 3 Jun 2021 14:49:26 -0300 Subject: [PATCH 4/4] fix conditionals --- Marlin/src/HAL/STM32/inc/Conditionals_adv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/HAL/STM32/inc/Conditionals_adv.h b/Marlin/src/HAL/STM32/inc/Conditionals_adv.h index 9c9a7014c7b4..d71a5c61b930 100644 --- a/Marlin/src/HAL/STM32/inc/Conditionals_adv.h +++ b/Marlin/src/HAL/STM32/inc/Conditionals_adv.h @@ -21,7 +21,7 @@ */ #pragma once -#if defined(USBD_USE_CDC_MSC) && DISABLED(NO_SD_HOST_DRIVE) +#if BOTH(SDSUPPORT, USBD_USE_CDC_MSC) && DISABLED(NO_SD_HOST_DRIVE) #define HAS_SD_HOST_DRIVE 1 #endif