Browse Source

👽️ Fix usb-host-msc-cdc-msc issue (#22025)

Victor Oliveira 4 years ago
parent
commit
0398a0b780
No account linked to committer's email address

+ 1
- 1
Marlin/src/HAL/STM32/inc/Conditionals_adv.h View File

21
  */
21
  */
22
 #pragma once
22
 #pragma once
23
 
23
 
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)
25
   #define HAS_SD_HOST_DRIVE 1
25
   #define HAS_SD_HOST_DRIVE 1
26
 #endif
26
 #endif
27
 
27
 

+ 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", "tool-stm32duino" ]:
31
+if platform_name in [ "usb-host-msc", "usb-host-msc-cdc-msc", "usb-host-msc-cdc-msc-2", "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)

+ 1
- 1
ini/stm32f1.ini View File

96
 [env:STM32F103RC_btt_USB]
96
 [env:STM32F103RC_btt_USB]
97
 extends           = env:STM32F103RC_btt
97
 extends           = env:STM32F103RC_btt
98
 platform          = ${common_stm32.platform}
98
 platform          = ${common_stm32.platform}
99
-platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc.zip
99
+platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-2.zip
100
 build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
100
 build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
101
 build_flags       = ${env:STM32F103RC_btt.build_flags} ${env:stm32_flash_drive.build_flags}
101
 build_flags       = ${env:STM32F103RC_btt.build_flags} ${env:stm32_flash_drive.build_flags}
102
   -DUSBCON
102
   -DUSBCON

+ 2
- 2
ini/stm32f4.ini View File

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

Loading…
Cancel
Save