Переглянути джерело

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

Tanguy Pruvot 5 роки тому
джерело
коміт
7d1eafc80a

+ 0
- 1
Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py Переглянути файл

9
                     "-mcpu=cortex-m3",
9
                     "-mcpu=cortex-m3",
10
                     "-mthumb",
10
                     "-mthumb",
11
 
11
 
12
-                    "-ffreestanding",
13
                     "-fsigned-char",
12
                     "-fsigned-char",
14
                     "-fno-move-loop-invariants",
13
                     "-fno-move-loop-invariants",
15
                     "-fno-strict-aliasing",
14
                     "-fno-strict-aliasing",

+ 9
- 6
platformio.ini Переглянути файл

258
 framework     = arduino
258
 framework     = arduino
259
 board         = genericSTM32F103RE
259
 board         = genericSTM32F103RE
260
 build_flags   = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
260
 build_flags   = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
261
-  ${common.build_flags}
261
+  ${common.build_flags} -std=gnu++14
262
+build_unflags = -std=gnu++11
262
 lib_deps      = ${common.lib_deps}
263
 lib_deps      = ${common.lib_deps}
263
 lib_ignore    = U8glib-HAL
264
 lib_ignore    = U8glib-HAL
264
   c1921b4
265
   c1921b4
268
   Adafruit NeoPixel
269
   Adafruit NeoPixel
269
   libf3e
270
   libf3e
270
   TMC26XStepper
271
   TMC26XStepper
271
-lib_ldf_mode  = 1
272
+#lib_ldf_mode  = 1
272
 src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
273
 src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
273
 monitor_speed = 250000
274
 monitor_speed = 250000
274
 
275
 
281
 board         = genericSTM32F103RC
282
 board         = genericSTM32F103RC
282
 extra_scripts = buildroot/share/PlatformIO/scripts/STM32F1_SKR_MINI.py
283
 extra_scripts = buildroot/share/PlatformIO/scripts/STM32F1_SKR_MINI.py
283
 build_flags   = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
284
 build_flags   = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
284
-  ${common.build_flags}
285
+  ${common.build_flags} -std=gnu++14
285
   -g
286
   -g
287
+build_unflags = -std=gnu++11
286
 lib_deps      = ${common.lib_deps}
288
 lib_deps      = ${common.lib_deps}
287
 lib_ignore    = U8glib-HAL
289
 lib_ignore    = U8glib-HAL
288
   c1921b4
290
   c1921b4
292
   Adafruit NeoPixel
294
   Adafruit NeoPixel
293
   libf3e
295
   libf3e
294
   TMC26XStepper
296
   TMC26XStepper
295
-lib_ldf_mode  = 1
297
+#lib_ldf_mode  = 1
296
 src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
298
 src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
297
 monitor_speed = 115200
299
 monitor_speed = 115200
298
 upload_protocol = stlink
300
 upload_protocol = stlink
328
 # MKS Robin (STM32F103ZET6)
330
 # MKS Robin (STM32F103ZET6)
329
 #
331
 #
330
 [env:mks_robin]
332
 [env:mks_robin]
331
-platform      = ststm32@5.3.0
333
+platform      = ststm32
332
 framework     = arduino
334
 framework     = arduino
333
 board         = genericSTM32F103ZE
335
 board         = genericSTM32F103ZE
334
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin.py
336
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin.py
335
 build_flags   = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
337
 build_flags   = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
336
-  ${common.build_flags}
338
+  ${common.build_flags} -std=gnu++14
337
   -DSTM32_XL_DENSITY
339
   -DSTM32_XL_DENSITY
340
+build_unflags = -std=gnu++11
338
 src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
341
 src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
339
 lib_deps      = ${common.lib_deps}
342
 lib_deps      = ${common.lib_deps}
340
 lib_ignore    = c1921b4
343
 lib_ignore    = c1921b4

Завантаження…
Відмінити
Зберегти