Bläddra i källkod

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

Tanguy Pruvot 5 år sedan
förälder
incheckning
7d1eafc80a
2 ändrade filer med 9 tillägg och 7 borttagningar
  1. 0
    1
      Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
  2. 9
    6
      platformio.ini

+ 0
- 1
Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py Visa fil

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

+ 9
- 6
platformio.ini Visa fil

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

Laddar…
Avbryt
Spara