0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

STM32F1: C++14 for static_assert, etc. (#14278)

Browse source
This commit is contained in:
Tanguy Pruvot 2019-06-13 01:44:32 +02:00 committed by Scott Lahteine
parent 26e7e33698
commit 7d1eafc80a
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
View file

@ -9,7 +9,6 @@ if __name__ == "__main__":
"-mcpu=cortex-m3", "-mcpu=cortex-m3",
"-mthumb", "-mthumb",
"-ffreestanding",
"-fsigned-char", "-fsigned-char",
"-fno-move-loop-invariants", "-fno-move-loop-invariants",
"-fno-strict-aliasing", "-fno-strict-aliasing",

15
platformio.ini
View file

@ -258,7 +258,8 @@ platform = ststm32
framework = arduino framework = arduino
board = genericSTM32F103RE board = genericSTM32F103RE
build_flags = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py build_flags = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
${common.build_flags} ${common.build_flags} -std=gnu++14
build_unflags = -std=gnu++11
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
lib_ignore = U8glib-HAL lib_ignore = U8glib-HAL
c1921b4 c1921b4
@ -268,7 +269,7 @@ lib_ignore = U8glib-HAL
Adafruit NeoPixel Adafruit NeoPixel
libf3e libf3e
TMC26XStepper TMC26XStepper
lib_ldf_mode = 1 #lib_ldf_mode = 1
src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1> src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
monitor_speed = 250000 monitor_speed = 250000
@ -281,8 +282,9 @@ framework = arduino
board = genericSTM32F103RC board = genericSTM32F103RC
extra_scripts = buildroot/share/PlatformIO/scripts/STM32F1_SKR_MINI.py extra_scripts = buildroot/share/PlatformIO/scripts/STM32F1_SKR_MINI.py
build_flags = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py build_flags = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
${common.build_flags} ${common.build_flags} -std=gnu++14
-g -g
build_unflags = -std=gnu++11
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
lib_ignore = U8glib-HAL lib_ignore = U8glib-HAL
c1921b4 c1921b4
@ -292,7 +294,7 @@ lib_ignore = U8glib-HAL
Adafruit NeoPixel Adafruit NeoPixel
libf3e libf3e
TMC26XStepper TMC26XStepper
lib_ldf_mode = 1 #lib_ldf_mode = 1
src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1> src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
monitor_speed = 115200 monitor_speed = 115200
upload_protocol = stlink upload_protocol = stlink
@ -328,13 +330,14 @@ monitor_speed = 250000
# MKS Robin (STM32F103ZET6) # MKS Robin (STM32F103ZET6)
# #
[env:mks_robin] [env:mks_robin]
platform = ststm32@5.3.0 platform = ststm32
framework = arduino framework = arduino
board = genericSTM32F103ZE board = genericSTM32F103ZE
extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin.py extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin.py
build_flags = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py build_flags = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
${common.build_flags} ${common.build_flags} -std=gnu++14
-DSTM32_XL_DENSITY -DSTM32_XL_DENSITY
build_unflags = -std=gnu++11
src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1> src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
lib_ignore = c1921b4 lib_ignore = c1921b4