Browse Source

🔨 Fix Serial+MSC for _USB envs (#22116)

Victor Oliveira 3 years ago
parent
commit
0669053b78
No account linked to committer's email address

+ 1
- 1
buildroot/share/PlatformIO/scripts/generic_create_variant.py View File

28
 else:
28
 else:
29
     platform_name = PackageSpec(platform_packages[0]).name
29
     platform_name = PackageSpec(platform_packages[0]).name
30
 
30
 
31
-if platform_name in [ "usb-host-msc", "usb-host-msc-cdc-msc", "usb-host-msc-cdc-msc-2", "tool-stm32duino" ]:
31
+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" ]:
32
     platform_name = "framework-arduinoststm32"
32
     platform_name = "framework-arduinoststm32"
33
 
33
 
34
 FRAMEWORK_DIR = platform.get_package_dir(platform_name)
34
 FRAMEWORK_DIR = platform.get_package_dir(platform_name)

+ 4
- 6
ini/stm32f1.ini View File

89
 [env:STM32F103RC_btt_USB]
89
 [env:STM32F103RC_btt_USB]
90
 extends           = env:STM32F103RC_btt
90
 extends           = env:STM32F103RC_btt
91
 platform          = ${common_stm32.platform}
91
 platform          = ${common_stm32.platform}
92
-platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-2.zip
92
+platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-3.zip
93
 build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
93
 build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
94
 build_flags       = ${env:STM32F103RC_btt.build_flags} ${env:stm32_flash_drive.build_flags}
94
 build_flags       = ${env:STM32F103RC_btt.build_flags} ${env:stm32_flash_drive.build_flags}
95
   -DUSBCON
95
   -DUSBCON
96
-  -DUSE_USBHOST_HS
96
+  -DUSE_USB_FS
97
   -DUSBD_IRQ_PRIO=5
97
   -DUSBD_IRQ_PRIO=5
98
   -DUSBD_IRQ_SUBPRIO=6
98
   -DUSBD_IRQ_SUBPRIO=6
99
-  -DUSE_USB_HS_IN_FS
100
   -DUSBD_USE_CDC_MSC
99
   -DUSBD_USE_CDC_MSC
101
 
100
 
102
 #
101
 #
188
 [env:STM32F103RE_btt_USB]
187
 [env:STM32F103RE_btt_USB]
189
 extends           = env:STM32F103RE_btt
188
 extends           = env:STM32F103RE_btt
190
 platform          = ${common_stm32.platform}
189
 platform          = ${common_stm32.platform}
191
-platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-2.zip
190
+platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-3.zip
192
 build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
191
 build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
193
 build_flags       = ${env:STM32F103RE_btt.build_flags} ${env:stm32_flash_drive.build_flags}
192
 build_flags       = ${env:STM32F103RE_btt.build_flags} ${env:stm32_flash_drive.build_flags}
194
   -DUSBCON
193
   -DUSBCON
195
-  -DUSE_USBHOST_HS
194
+  -DUSE_USB_FS
196
   -DUSBD_IRQ_PRIO=5
195
   -DUSBD_IRQ_PRIO=5
197
   -DUSBD_IRQ_SUBPRIO=6
196
   -DUSBD_IRQ_SUBPRIO=6
198
-  -DUSE_USB_HS_IN_FS
199
   -DUSBD_USE_CDC_MSC
197
   -DUSBD_USE_CDC_MSC
200
 
198
 
201
 #
199
 #

+ 2
- 2
ini/stm32f4.ini View File

145
 # USB Flash Drive mix-ins for STM32
145
 # USB Flash Drive mix-ins for STM32
146
 #
146
 #
147
 [stm_flash_drive]
147
 [stm_flash_drive]
148
-platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-2.zip
148
+platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-3.zip
149
 build_flags       = ${common_stm32.build_flags}
149
 build_flags       = ${common_stm32.build_flags}
150
   -DHAL_PCD_MODULE_ENABLED -DHAL_HCD_MODULE_ENABLED
150
   -DHAL_PCD_MODULE_ENABLED -DHAL_HCD_MODULE_ENABLED
151
   -DUSBHOST -DUSBH_IRQ_PRIO=3 -DUSBH_IRQ_SUBPRIO=4
151
   -DUSBHOST -DUSBH_IRQ_PRIO=3 -DUSBH_IRQ_SUBPRIO=4
420
 [env:mks_robin_nano_v3_usb_flash_drive_msc]
420
 [env:mks_robin_nano_v3_usb_flash_drive_msc]
421
 platform          = ${common_stm32.platform}
421
 platform          = ${common_stm32.platform}
422
 extends           = env:mks_robin_nano_v3
422
 extends           = env:mks_robin_nano_v3
423
-platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-2.zip
423
+platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-3.zip
424
 build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
424
 build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
425
 build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags}
425
 build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags}
426
   -DUSBCON
426
   -DUSBCON

Loading…
Cancel
Save