b4tman
/
Marlin
1
0
Fork 0
Code Issues Releases 3 Activity

Normalize HAL/STM32 targets (#17904)

This commit is contained in:
Jason Smith 2020-05-09 23:49:30 -07:00 committed by GitHub
parent 71b41c963b
commit ba9a9bbe58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 124 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/test-builds.yml vendored
View File

@ -52,13 +52,19 @@ jobs:
- jgaurora_a5s_a1
- STM32F103VE_longer
- STM32F407VE_black
- STM32F401VE_STEVAL
- BIGTREE_BTT002
- BIGTREE_SKR_PRO
- BIGTREE_GTR_V1_0
- mks_robin
- ARMED
- FYSETC_S6
- STM32F070RB_malyan
- malyan_M300
- mks_robin_lite
- FLYF407ZG
- rumba32_f446ve
- rumba32_mks
- mks_robin_pro
# Put lengthy tests last
@ -72,8 +78,6 @@ jobs:
#- STM32F7
# Non-working environment tests
#- BIGTREE_BTT002
#- at90usb1286_cdc
#- at90usb1286_dfu
#- STM32F103CB_malyan

1
buildroot/share/PlatformIO/boards/BigTree_Btt002.json
View File

@ -14,7 +14,6 @@
"0x3748"
]
],
"ldscript": "stm32f407xg.ld",
"mcu": "stm32f407vgt6",
"variant": "BIGTREE_BTT002"
},

1
buildroot/share/PlatformIO/boards/BigTree_SKR_Pro.json
View File

@ -14,7 +14,6 @@
"0x3748"
]
],
"ldscript": "stm32f407xg.ld",
"mcu": "stm32f407zgt6",
"variant": "BIGTREE_SKR_PRO_1v1"
},

1
buildroot/share/PlatformIO/boards/FLYF407ZG.json
View File

@ -14,7 +14,6 @@
"0x3748"
]
],
"ldscript": "stm32f407xg.ld",
"mcu": "stm32f407zgt6",
"variant": "FLY_F407ZG"
},

1
buildroot/share/PlatformIO/boards/blackSTM32F407VET6.json
View File

@ -14,7 +14,6 @@
"0x3748"
]
],
"ldscript": "stm32f407xe.ld",
"mcu": "stm32f407vet6",
"variant": "MARLIN_F407VE"
},

5
buildroot/share/tests/ARMED-tests
View File

@ -9,8 +9,11 @@ set -e
#
# Build with the default configurations
#
restore_configs
use_example_configs ArmEd
exec_test $1 $2 "ArmEd Example Configuration"
opt_set X_DRIVER_TYPE TMC2130
opt_set Y_DRIVER_TYPE TMC2208
exec_test $1 $2 "ArmEd Example Configuration with mixed TMC Drivers"
# clean up
restore_configs

4
buildroot/share/tests/BIGTREE_GTR_V1_0-tests
View File

@ -21,7 +21,9 @@ opt_set TEMP_SENSOR_7 1
opt_set E0_AUTO_FAN_PIN PC10
opt_set E1_AUTO_FAN_PIN PC11
opt_set E2_AUTO_FAN_PIN PC12
exec_test $1 $2 "BigTreeTech GTR 8 Extruders with Auto-Fan"
opt_set X_DRIVER_TYPE TMC2208
opt_set Y_DRIVER_TYPE TMC2130
exec_test $1 $2 "BigTreeTech GTR 8 Extruders with Auto-Fan and Mixed TMC Drivers"
restore_configs
opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0

3
buildroot/share/tests/BIGTREE_SKR_PRO-tests
View File

@ -23,9 +23,10 @@ opt_set TEMP_SENSOR_2 1
opt_set E0_AUTO_FAN_PIN PC10
opt_set E1_AUTO_FAN_PIN PC11
opt_set E2_AUTO_FAN_PIN PC12
opt_set BLTOUCH Z_SAFE_HOMING
opt_set X_DRIVER_TYPE TMC2209
opt_set Y_DRIVER_TYPE TMC2130
exec_test $1 $2 "BigTreeTech SKR Pro 3 Extruders with Auto-Fan and mixed TMC drivers"
exec_test $1 $2 "BigTreeTech SKR Pro 3 Extruders, Auto-Fan, BLTOUCH, and mixed TMC drivers"
# clean up
restore_configs

18
buildroot/share/tests/FLYF407ZG-tests Normal file
View File

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

2
buildroot/share/tests/FYSETC_S6-tests
View File

@ -9,6 +9,8 @@ set -e
# Build examples
restore_configs
use_example_configs FYSETC/S6
opt_set Y_DRIVER_TYPE TMC2209
opt_set Z_DRIVER_TYPE TMC2130
exec_test $1 $2 "FYSETC S6 Example"
# cleanup

15
buildroot/share/tests/STM32F070RB_malyan-tests Normal file
View File

@ -0,0 +1,15 @@
#!/usr/bin/env bash
#
# Build tests for STM32F070RB Malyan M200 v2
#
# exit on first failure
set -e
restore_configs
opt_set MOTHERBOARD BOARD_MALYAN_M200_V2
opt_set SERIAL_PORT -1
exec_test $1 $2 "Malyan M200 v2 Default Config"
# cleanup
restore_configs

16
buildroot/share/tests/STM32F401VE_STEVAL-tests Normal file
View File

@ -0,0 +1,16 @@
#!/usr/bin/env bash
#
# Build tests for STM32F401VE_STEVAL
#
# exit on first failure
set -e
# Build examples
restore_configs
opt_set MOTHERBOARD BOARD_STEVAL_3DP001V1
opt_set SERIAL_PORT -1
exec_test $1 $2 "STM32F401VE_STEVAL Default Config"
# cleanup
restore_configs

1
buildroot/share/tests/STM32F407VE_black-tests
View File

@ -6,6 +6,7 @@
# exit on first failure
set -e
restore_configs
use_example_configs STM32/Black_STM32F407VET6
opt_enable BAUD_RATE_GCODE
exec_test $1 $2 "Full-featured Sample Black STM32F407VET6 config"

1
buildroot/share/tests/malyan_M300-tests
View File

@ -6,6 +6,7 @@
# exit on first failure
set -e
restore_configs
use_example_configs "delta/Malyan M300"
opt_disable AUTO_BED_LEVELING_3POINT
exec_test $1 $2 "Malyan M300 (delta)"

17
buildroot/share/tests/rumba32_f446ve-tests Normal file
View File

@ -0,0 +1,17 @@
#!/usr/bin/env bash
#
# Build tests for rumba32_f446ve
#
# exit on first failure
set -e
# Build examples
restore_configs
opt_set MOTHERBOARD BOARD_RUMBA32_AUS3D
opt_set SERIAL_PORT -1
opt_set X_DRIVER_TYPE TMC2130
exec_test $1 $2 "rumba32_f446ve Default Config with TMC2130"
# cleanup
restore_configs

18
buildroot/share/tests/rumba32_mks-tests Normal file
View File

@ -0,0 +1,18 @@
#!/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

34
platformio.ini
View File

@ -21,6 +21,7 @@ boards_dir = buildroot/share/PlatformIO/boards
default_envs = mega2560
[common]
arduinoststm32_ver = >=4.10700,<4.10800
default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = -fmax-errors=5 -g -D__MARLIN_FIRMWARE__ -fmerge-all-constants
@ -470,6 +471,7 @@ src_filter = ${common.default_src_filter} +<src/HAL/STM32_F4_F7> -<src/HAL/ST
#
[env:ARMED]
platform = ststm32
platform_packages = framework-arduinoststm32@${common.arduinoststm32_ver}
board = armed_v1
build_flags = ${common.build_flags}
-DUSBCON -DUSBD_VID=0x0483 '-DUSB_MANUFACTURER="Unknown"' '-DUSB_PRODUCT="ARMED_V1"' -DUSBD_USE_CDC
@ -638,12 +640,14 @@ lib_ignore = LiquidCrystal, LiquidTWI2, Adafruit NeoPixel, TMCStepper, U8glib-H
#
[env:STM32F070RB_malyan]
platform = ststm32
platform_packages = framework-arduinoststm32@${common.arduinoststm32_ver}
board = malyanM200v2
build_flags = -DSTM32F0xx -DUSBCON -DUSBD_VID=0x0483 '-DUSB_MANUFACTURER="Unknown"' '-DUSB_PRODUCT="ARMED_V1"' -DUSBD_USE_CDC -DHAL_PCD_MODULE_ENABLED
-O2 -ffreestanding -fsigned-char -fno-move-loop-invariants -fno-strict-aliasing -std=gnu11 -std=gnu++11
-DCUSTOM_STARTUP_FILE
-IMarlin/src/HAL/STM32
src_filter = ${common.default_src_filter} +<src/HAL/STM32>
lib_ignore = LiquidCrystal, LiquidTWI2, Adafruit NeoPixel, TMCStepper, U8glib-HAL
lib_ignore = LiquidCrystal, LiquidTWI2, Adafruit NeoPixel, TMCStepper, U8glib-HAL, SoftwareSerial
#
# Malyan M300 (STM32F070CB)
@ -676,8 +680,8 @@ lib_ignore = Adafruit NeoPixel
#
[env:STM32F401VE_STEVAL]
platform = ststm32
platform_packages = framework-arduinoststm32@${common.arduinoststm32_ver}
board = STEVAL_STM32F401VE
platform_packages = framework-arduinoststm32@>=3.10700,<4
build_flags = ${common.build_flags}
-DTARGET_STM32F4 -DARDUINO_STEVAL -DSTM32F401xE
-DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"STEVAL_F401VE\"
@ -694,15 +698,15 @@ src_filter = ${common.default_src_filter} +<src/HAL/STM32>
#
[env:FLYF407ZG]
platform = ststm32
platform_packages = framework-arduinoststm32@${common.arduinoststm32_ver}
board = FLYF407ZG
platform_packages = framework-arduinoststm32@>=3.10700,<4
build_flags = ${common.build_flags}
-DSTM32F4 -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"STM32F407ZG\"
-DTARGET_STM32F4 -DVECT_TAB_OFFSET=0x8000
-IMarlin/src/HAL/STM32
build_unflags = -std=gnu++11
extra_scripts = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
lib_ignore = Adafruit NeoPixel, TMCStepper, SailfishLCD, SlowSoftI2CMaster, SoftwareSerial
lib_ignore = Adafruit NeoPixel, SailfishLCD, SlowSoftI2CMaster, SoftwareSerial
src_filter = ${common.default_src_filter} +<src/HAL/STM32>
@ -711,10 +715,10 @@ src_filter = ${common.default_src_filter} +<src/HAL/STM32>
#
[env:FYSETC_S6]
platform = ststm32
board = fysetc_s6
platform_packages =
tool-stm32duino
framework-arduinoststm32@>=3.10700,<4
framework-arduinoststm32@${common.arduinoststm32_ver}
board = fysetc_s6
build_flags = ${common.build_flags}
-DTARGET_STM32F4 -std=gnu++14
-DVECT_TAB_OFFSET=0x10000
@ -735,8 +739,8 @@ upload_protocol = serial
#
[env:STM32F407VE_black]
platform = ststm32
platform_packages = framework-arduinoststm32@${common.arduinoststm32_ver}
board = blackSTM32F407VET6
platform_packages = framework-arduinoststm32@>=3.10700,<4
build_flags = ${common.build_flags}
-DTARGET_STM32F4 -DARDUINO_BLACK_F407VE
-DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"BLACK_F407VE\"
@ -752,8 +756,8 @@ src_filter = ${common.default_src_filter} +<src/HAL/STM32>
#
[env:BIGTREE_SKR_PRO]
platform = ststm32
platform_packages = framework-arduinoststm32@${common.arduinoststm32_ver}
board = BigTree_SKR_Pro
platform_packages = framework-arduinoststm32@>=3.10700,<4
build_flags = ${common.build_flags}
-DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"STM32F407ZG\"
-DTARGET_STM32F4 -DSTM32F407_5ZX -DVECT_TAB_OFFSET=0x8000
@ -772,7 +776,7 @@ debug_init_break =
#
[env:BIGTREE_GTR_V1_0]
platform = ststm32@>=5.7.0
platform_packages = framework-arduinoststm32@>=3.10700,<4
platform_packages = framework-arduinoststm32@${common.arduinoststm32_ver}
board = BigTree_SKR_Pro
extra_scripts = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
build_flags = ${common.build_flags}
@ -794,8 +798,8 @@ src_filter = ${common.default_src_filter} +<src/HAL/STM32>
#
[env:BIGTREE_BTT002]
platform = ststm32@5.6.0
platform_packages = framework-arduinoststm32@${common.arduinoststm32_ver}
board = BigTree_Btt002
platform_packages = framework-arduinoststm32@>=3.10700,<4
build_flags = ${common.build_flags}
-DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"STM32F407VG\"
-DTARGET_STM32F4 -DSTM32F407_5VX -DVECT_TAB_OFFSET=0x8000
@ -883,6 +887,7 @@ debug_tool = jlink
#
[env:rumba32_f446ve]
platform = ststm32
platform_packages = framework-arduinoststm32@${common.arduinoststm32_ver}
board = rumba32_f446ve
build_flags = ${common.build_flags}
-DSTM32F4xx
@ -899,7 +904,8 @@ build_flags = ${common.build_flags}
-DDISABLE_GENERIC_SERIALUSB
-DHAL_UART_MODULE_ENABLED
-Os
lib_ignore = Adafruit NeoPixel
-IMarlin/src/HAL/STM32
lib_ignore = Adafruit NeoPixel, SoftwareSerial
src_filter = ${common.default_src_filter} +<src/HAL/STM32>
monitor_speed = 500000
upload_protocol = dfu
@ -909,6 +915,7 @@ upload_protocol = dfu
#
[env:rumba32_mks]
platform = ststm32
platform_packages = framework-arduinoststm32@${common.arduinoststm32_ver}
board = rumba32_f446ve
build_flags = ${common.build_flags}
-DSTM32F4xx -DARDUINO_RUMBA32_F446VE -DARDUINO_ARCH_STM32 "-DBOARD_NAME=\"RUMBA32_F446VE\""
@ -920,8 +927,9 @@ build_flags = ${common.build_flags}
-DDISABLE_GENERIC_SERIALUSB
-DHAL_UART_MODULE_ENABLED
-Os
lib_ignore = Adafruit NeoPixel
src_filter = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/STM32_F4_F7> -<src/HAL/STM32_F4_F7/STM32F7>
-IMarlin/src/HAL/STM32
lib_ignore = Adafruit NeoPixel, SoftwareSerial
src_filter = ${common.default_src_filter} +<src/HAL/STM32>
upload_protocol = dfu
#