Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update platform STM32 to version 10, optimize build #20325

Merged
merged 10 commits into from
Dec 2, 2020
Merged

Update platform STM32 to version 10, optimize build #20325

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2757ef7
Use dev version of framework-arduinoststm32-maple
mathiasvr Nov 29, 2020
05774c7
Use for all common_stm32f1 envs
mathiasvr Nov 30, 2020
e8c8506
make common_stm32f1 inherit platform_packages
mathiasvr Nov 30, 2020
9ceb6bd
add tool-stm32duino to common_stm32f1
mathiasvr Nov 30, 2020
7096855
use arduinoststm32-maple@~3.10000
mathiasvr Nov 30, 2020
4ec904b
add -DARDUINO_ARCH_STM32
mathiasvr Nov 30, 2020
856bec8
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
mathiasvr Nov 30, 2020
89c47e6
Update ststm32 to v10.0
mathiasvr Nov 30, 2020
a64a3f2
lib_ignore FreeRTOS701, FreeRTOS821
thinkyhead Nov 30, 2020
ac82cfc
Minor change removing extra line
thinkyhead Dec 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 10 additions & 15 deletions platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@ board = nxp_lpc1769
# HAL/STM32 Base Environment values
#
[common_stm32]
platform = ststm32@~8.0
platform = ststm32@~10.0
build_flags = ${common.build_flags}
-std=gnu++14
-DUSBCON -DUSBD_USE_CDC
Expand All @@ -734,14 +734,17 @@ src_filter = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/shared/b
# HAL/STM32F1 Common Environment values
#
[common_stm32f1]
platform = ststm32@~6.1
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
platform = ststm32@~10.0
board_build.core = maple
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
${common.build_flags}
build_unflags = -std=gnu11 -std=gnu++11
src_filter = ${common.default_src_filter} +<src/HAL/STM32F1>
lib_ignore = SPI
lib_deps = ${common.lib_deps}
-DARDUINO_ARCH_STM32
mathiasvr marked this conversation as resolved.
Show resolved Hide resolved
build_unflags = -std=gnu11 -std=gnu++11
src_filter = ${common.default_src_filter} +<src/HAL/STM32F1>
lib_ignore = SPI, FreeRTOS701, FreeRTOS821
lib_deps = ${common.lib_deps}
SoftwareSerialM
platform_packages = tool-stm32duino

#
# STM32F103RC
Expand All @@ -750,7 +753,6 @@ lib_deps = ${common.lib_deps}
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = genericSTM32F103RC
platform_packages = tool-stm32duino
monitor_speed = 115200

#
Expand All @@ -760,7 +762,6 @@ monitor_speed = 115200
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = MEEB_3DP
platform_packages = tool-stm32duino
build_flags = ${common_stm32f1.build_flags}
-DDEBUG_LEVEL=0
-DSS_TIMER=4
Expand Down Expand Up @@ -842,7 +843,6 @@ lib_deps = ${env:STM32F103RC_btt_512K.lib_deps}
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = genericSTM32F103RE
platform_packages = tool-stm32duino
monitor_speed = 115200

#
Expand Down Expand Up @@ -922,7 +922,6 @@ build_flags = ${common_stm32f1.build_flags}
-DMCU_STM32F103VE -DSTM32F1xx -USERIAL_USB -DU20 -DTS_V12
build_unflags = ${common_stm32f1.build_unflags}
-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
lib_ignore = ${common_stm32f1.lib_ignore}

#
# MKS Robin Mini (STM32F103VET6)
Expand All @@ -943,7 +942,6 @@ build_flags = ${common_stm32f1.build_flags}
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = genericSTM32F103VE
platform_packages = tool-stm32duino
extra_scripts = ${common.extra_scripts}
buildroot/share/PlatformIO/scripts/mks_robin_nano35.py
build_flags = ${common_stm32f1.build_flags}
Expand Down Expand Up @@ -1024,7 +1022,6 @@ build_flags = ${common_stm32f1.build_flags}
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = genericSTM32F103VE
platform_packages = tool-stm32duino
extra_scripts = ${common.extra_scripts}
buildroot/share/PlatformIO/scripts/mks_robin_e3p.py
build_flags = ${common_stm32f1.build_flags}
Expand Down Expand Up @@ -1153,7 +1150,6 @@ upload_protocol = jlink
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = genericSTM32F103VE
platform_packages = tool-stm32duino
extra_scripts = ${common.extra_scripts}
buildroot/share/PlatformIO/scripts/mks_robin_mini.py
buildroot/share/PlatformIO/scripts/add_nanolib.py
Expand Down Expand Up @@ -1195,7 +1191,6 @@ extra_scripts = ${common.extra_scripts}
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = genericSTM32F103RC
platform_packages = tool-stm32duino
extra_scripts = ${common.extra_scripts}
buildroot/share/PlatformIO/scripts/fly_mini.py
build_flags = ${common_stm32f1.build_flags}
Expand Down