Clean up RUMBA32 PlatformIO & tests (#18271)

This commit is contained in:
Chris Barr 2020-06-19 07:56:40 +09:30 committed by GitHub
parent ef2657d565
commit d2363c5b35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 58 deletions

View file

@ -320,7 +320,7 @@ board = nxp_lpc1769
#
# HAL/STM32 Base Environment values
#
[base_stm32]
[common_stm32]
platform = ststm32@<6.2.0
platform_packages = framework-arduinoststm32@>=4.10700,<4.10800
lib_deps = ${common.lib_deps}
@ -328,17 +328,10 @@ lib_ignore = SoftwareSerial
build_flags = ${common.build_flags}
-IMarlin/src/HAL/STM32 -std=gnu++14
-DUSBCON -DUSBD_USE_CDC
-DUSBD_VID=0x0483
build_unflags = -std=gnu++11
src_filter = ${common.default_src_filter} +<src/HAL/STM32>
#
# HAL/STM32 Common Environment values
#
[common_stm32]
platform = ${base_stm32.platform}
extends = base_stm32
build_flags = ${base_stm32.build_flags} -DUSBD_VID=0x0483
#
# HAL/STM32F1 Common Environment values
#
@ -814,13 +807,12 @@ lib_ignore = Adafruit NeoPixel, SailfishLCD, SlowSoftI2CMaster, SoftwareS
#
# RUMBA32
#
[common_rumba32]
platform = ${base_stm32.platform}
extends = base_stm32
build_flags = ${base_stm32.build_flags} -Os
-DSTM32F4xx -DARDUINO_RUMBA32_F446VE -DARDUINO_ARCH_STM32 "-DBOARD_NAME=\"RUMBA32_F446VE\""
-DSTM32F446xx "-DUSB_PRODUCT=\"RUMBA32_F446VE\""
[env:rumba32]
platform = ${common_stm32.platform}
extends = common_stm32
build_flags = ${common_stm32.build_flags}
-Os
"-DUSB_PRODUCT=\"RUMBA32\""
-DHAL_PCD_MODULE_ENABLED
-DDISABLE_GENERIC_SERIALUSB
-DHAL_UART_MODULE_ENABLED
@ -828,22 +820,6 @@ board = rumba32_f446ve
upload_protocol = dfu
monitor_speed = 500000
#
# RUMBA32 F446VE
#
[env:rumba32_f446ve]
platform = ${common_rumba32.platform}
extends = common_rumba32
build_flags = ${common_rumba32.build_flags} -DUSBD_VID=0x0483
#
# MKS RUMBA32 (adds TMC2208/2209 UART interface and AUX-1)
#
[env:rumba32_mks]
platform = ${common_rumba32.platform}
extends = common_rumba32
build_flags = ${common_rumba32.build_flags} -DUSBD_VID=0x8000
#################################
# #
# Other Architectures #