- fixed building for STM32 flash-drive mix-in enabled board configurations

Please check PR rhapsodyv/Arduino_Core_STM32#1 and if @rhapsodyv has merged then adjust the dependency to an official one!

Author: quiret

buildroot/share/PlatformIO/scripts/generic_create_variant.py

@@ -34,7 +34,7 @@
     else:
         platform_name = PackageSpec(platform_packages[0]).name
 
-    if platform_name in [ "usb-host-msc", "usb-host-msc-cdc-msc", "usb-host-msc-cdc-msc-2", "usb-host-msc-cdc-msc-3", "tool-stm32duino", "biqu-bx-workaround", "main" ]:
+    if platform_name in [ "Arduino_Core_STM32", "usb-host-msc", "usb-host-msc-cdc-msc", "usb-host-msc-cdc-msc-2", "usb-host-msc-cdc-msc-3", "tool-stm32duino", "biqu-bx-workaround", "main" ]:
         platform_name = "framework-arduinoststm32"
 
     FRAMEWORK_DIR = Path(platform.get_package_dir(platform_name))

ini/stm32-common.ini

@@ -49,7 +49,7 @@ extra_scripts = ${stm32_variant.extra_scripts}
 # 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-cdc-msc-3.zip
+platform_packages = framework-arduinoststm32@https://github.com/quiret/Arduino_Core_STM32.git#usb-host-msc-cdc-msc-3
 build_flags       = ${common_stm32.build_flags}
                     -DHAL_PCD_MODULE_ENABLED -DHAL_HCD_MODULE_ENABLED
                     -DUSBHOST -DUSBH_IRQ_PRIO=3 -DUSBH_IRQ_SUBPRIO=4

ini/stm32f1.ini

@@ -66,6 +66,7 @@ board_upload.offset_address = 0x08007000
 [env:STM32F103RC_btt_USB]
 extends           = env:STM32F103RC_btt
 platform_packages = ${stm_flash_drive.platform_packages}
+board_build.variant = MARLIN_F103Rx
 build_flags       = ${env:STM32F103RC_btt.build_flags}
                     -DUSE_USB_FS
                     -DUSBD_IRQ_PRIO=5
@@ -204,6 +205,7 @@ upload_protocol             = jlink
 [env:STM32F103RE_btt_USB]
 extends           = env:STM32F103RE_btt
 platform_packages = ${stm_flash_drive.platform_packages}
+board_build.variant = MARLIN_F103Rx
 build_flags       = ${env:STM32F103RE_btt.build_flags}
                     -DUSE_USB_FS -DUSBD_IRQ_PRIO=5
                     -DUSBD_IRQ_SUBPRIO=6 -DUSBD_USE_CDC_MSC
@@ -463,17 +465,17 @@ build_unflags             = ${stm32_variant_latest.build_unflags} -DUSBD_USE_CDC
 [env:STM32F103RC_ZM3E2_USB]
 extends              = ZONESTAR_ZM3E
 board                = genericSTM32F103RC
-#board_build.variant  = MARLIN_F103Rx
+board_build.variant  = MARLIN_F103Rx
 
 [env:STM32F103VC_ZM3E4_USB]
 extends              = ZONESTAR_ZM3E
 board                = genericSTM32F103VC
-#board_build.variant  = MARLIN_F103Vx
+board_build.variant  = MARLIN_F103Vx
 build_flags          = ${ZONESTAR_ZM3E.build_flags} -DTIMER_TONE=TIM1
 
 [env:STM32F103VE_ZM3E4V2_USB]
 extends              = ZONESTAR_ZM3E
 board                = genericSTM32F103VE
-#board_build.variant  = MARLIN_F103Vx
+board_build.variant  = MARLIN_F103Vx
 build_flags          = ${ZONESTAR_ZM3E.build_flags} -DTIMER_TONE=TIM1
 board_upload.maximum_size = 499712