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

@ -64,8 +64,7 @@ jobs:
- malyan_M300 - malyan_M300
- mks_robin_lite - mks_robin_lite
- FLYF407ZG - FLYF407ZG
- rumba32_f446ve - rumba32
- rumba32_mks
- mks_robin_pro - mks_robin_pro
- STM32F103RET6_creality - STM32F103RET6_creality

View File

@ -567,11 +567,11 @@
#elif MB(ARMED) #elif MB(ARMED)
#include "stm32f4/pins_ARMED.h" // STM32F4 env:ARMED #include "stm32f4/pins_ARMED.h" // STM32F4 env:ARMED
#elif MB(RUMBA32_V1_0) #elif MB(RUMBA32_V1_0)
#include "stm32f4/pins_RUMBA32_AUS3D.h" // STM32F4 env:rumba32_f446ve #include "stm32f4/pins_RUMBA32_AUS3D.h" // STM32F4 env:rumba32
#elif MB(RUMBA32_V1_1) #elif MB(RUMBA32_V1_1)
#include "stm32f4/pins_RUMBA32_AUS3D.h" // STM32F4 env:rumba32_f446ve #include "stm32f4/pins_RUMBA32_AUS3D.h" // STM32F4 env:rumba32
#elif MB(RUMBA32_MKS) #elif MB(RUMBA32_MKS)
#include "stm32f4/pins_RUMBA32_MKS.h" // STM32F4 env:rumba32_mks #include "stm32f4/pins_RUMBA32_MKS.h" // STM32F4 env:rumba32
#elif MB(BLACK_STM32F407VE) #elif MB(BLACK_STM32F407VE)
#include "stm32f4/pins_BLACK_STM32F407VE.h" // STM32F4 env:STM32F407VE_black #include "stm32f4/pins_BLACK_STM32F407VE.h" // STM32F4 env:STM32F407VE_black
#elif MB(STEVAL_3DP001V1) #elif MB(STEVAL_3DP001V1)

View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# #
# Build tests for rumba32_f446ve # Build tests for rumba32
# #
# exit on first failure # exit on first failure
@ -15,7 +15,7 @@ opt_enable PIDTEMPBED
opt_set TEMP_SENSOR_BED 1 opt_set TEMP_SENSOR_BED 1
opt_disable THERMAL_PROTECTION_BED opt_disable THERMAL_PROTECTION_BED
opt_set X_DRIVER_TYPE TMC2130 opt_set X_DRIVER_TYPE TMC2130
exec_test $1 $2 "rumba32_f446ve V1.0 with TMC2130, PID Bed, and bed thermal protection disabled" exec_test $1 $2 "RUMBA32 V1.0 with TMC2130, PID Bed, and bed thermal protection disabled"
# Build examples # Build examples
restore_configs restore_configs
@ -25,7 +25,15 @@ opt_enable PIDTEMPBED EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_FULL_GRAPH
opt_set TEMP_SENSOR_BED 1 opt_set TEMP_SENSOR_BED 1
opt_set X_DRIVER_TYPE TMC2130 opt_set X_DRIVER_TYPE TMC2130
opt_set Y_DRIVER_TYPE TMC2208 opt_set Y_DRIVER_TYPE TMC2208
exec_test $1 $2 "rumba32_f446ve V1.1 with TMC2130, TMC2208, PID Bed, EEPROM settings, and graphic LCD controller" exec_test $1 $2 "RUMBA32 V1.1 with TMC2130, TMC2208, PID Bed, EEPROM settings, and graphic LCD controller"
# Build examples
restore_configs
opt_set MOTHERBOARD BOARD_RUMBA32_MKS
opt_set SERIAL_PORT -1
opt_set X_DRIVER_TYPE TMC2130
opt_set Y_DRIVER_TYPE TMC2208
exec_test $1 $2 "RUMBA32 MKS Default Config with Mixed TMC Drivers"
# cleanup # cleanup
restore_configs restore_configs

View File

@ -1,18 +0,0 @@
#!/usr/bin/env bash
#
# Build tests for rumba32_mks
#
# exit on first failure
set -e
# Build examples
restore_configs
opt_set MOTHERBOARD BOARD_RUMBA32_MKS
opt_set SERIAL_PORT -1
opt_set X_DRIVER_TYPE TMC2130
opt_set Y_DRIVER_TYPE TMC2208
exec_test $1 $2 "rumba32_mks Default Config with Mixed TMC Drivers"
# cleanup
restore_configs

View File

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