Skip to content

Commit 5513e67

Browse files
thinkyheadthinkyhead
committed
2.0.5.4 : Use ststm32 < 6.2
1 parent 354a9e5 commit 5513e67

File tree

3 files changed

+35
-35
lines changed

3 files changed

+35
-35
lines changed

‎Marlin/Version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
/**
2929
* Marlin release version identifier
3030
*/
31-
//#define SHORT_BUILD_VERSION "2.0.5.3"
31+
//#define SHORT_BUILD_VERSION "2.0.5.4"
3232

3333
/**
3434
* Verbose version identifier which should contain a reference to the location
@@ -41,7 +41,7 @@
4141
* here we define this default string as the date where the latest release
4242
* version was tagged.
4343
*/
44-
//#define STRING_DISTRIBUTION_DATE "2020-01-31"
44+
//#define STRING_DISTRIBUTION_DATE "2020-07-09"
4545

4646
/**
4747
* Defines a generic printer name to be output to the LCD after booting Marlin.

‎Marlin/src/inc/Version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* Release version. Leave the Marlin version or apply a custom scheme.
2626
*/
2727
#ifndef SHORT_BUILD_VERSION
28-
#define SHORT_BUILD_VERSION "2.0.5.3"
28+
#define SHORT_BUILD_VERSION "2.0.5.4"
2929
#endif
3030

3131
/**
@@ -42,7 +42,7 @@
4242
* version was tagged.
4343
*/
4444
#ifndef STRING_DISTRIBUTION_DATE
45-
#define STRING_DISTRIBUTION_DATE "2020-03-31"
45+
#define STRING_DISTRIBUTION_DATE "2020-07-09"
4646
#endif
4747

4848
/**

‎platformio.ini‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ lib_deps = Servo
249249
# STM32F103RC
250250
#
251251
[env:STM32F103RC]
252-
platform = ststm32
252+
platform = ststm32@<6.2.0
253253
board = genericSTM32F103RC
254254
platform_packages = tool-stm32duino
255255
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -265,7 +265,7 @@ monitor_speed = 115200
265265
# STM32F103RC_fysetc
266266
#
267267
[env:STM32F103RC_fysetc]
268-
platform = ststm32
268+
platform = ststm32@<6.2.0
269269
board = genericSTM32F103RC
270270
#board_build.core = maple
271271
platform_packages = tool-stm32duino
@@ -291,7 +291,7 @@ upload_protocol = serial
291291
#
292292

293293
[env:STM32F103RC_btt]
294-
platform = ststm32
294+
platform = ststm32@<6.2.0
295295
board = genericSTM32F103RC
296296
platform_packages = tool-stm32duino
297297
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -306,7 +306,7 @@ lib_ignore = Adafruit NeoPixel, SPI
306306
monitor_speed = 115200
307307

308308
[env:STM32F103RC_btt_USB]
309-
platform = ststm32
309+
platform = ststm32@<6.2.0
310310
board = genericSTM32F103RC
311311
platform_packages = tool-stm32duino
312312
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -321,7 +321,7 @@ lib_ignore = Adafruit NeoPixel, SPI
321321
monitor_speed = 115200
322322

323323
[env:STM32F103RC_btt_512K]
324-
platform = ststm32
324+
platform = ststm32@<6.2.0
325325
board = genericSTM32F103RC
326326
board_upload.maximum_size=524288
327327
platform_packages = tool-stm32duino
@@ -337,7 +337,7 @@ lib_ignore = Adafruit NeoPixel, SPI
337337
monitor_speed = 115200
338338

339339
[env:STM32F103RC_btt_512K_USB]
340-
platform = ststm32
340+
platform = ststm32@<6.2.0
341341
board = genericSTM32F103RC
342342
board_upload.maximum_size=524288
343343
platform_packages = tool-stm32duino
@@ -356,7 +356,7 @@ monitor_speed = 115200
356356
# STM32F103RE
357357
#
358358
[env:STM32F103RE]
359-
platform = ststm32
359+
platform = ststm32@<6.2.0
360360
board = genericSTM32F103RE
361361
platform_packages = tool-stm32duino
362362
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -373,7 +373,7 @@ monitor_speed = 115200
373373
# STM32F103RE_btt_USB ......... RET6 (USB mass storage)
374374
#
375375
[env:STM32F103RE_btt]
376-
platform = ststm32
376+
platform = ststm32@<6.2.0
377377
board = genericSTM32F103RE
378378
platform_packages = tool-stm32duino
379379
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -389,7 +389,7 @@ upload_protocol = stlink
389389
monitor_speed = 115200
390390

391391
[env:STM32F103RE_btt_USB]
392-
platform = ststm32
392+
platform = ststm32@<6.2.0
393393
board = genericSTM32F103RE
394394
platform_packages = tool-stm32duino
395395
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -408,7 +408,7 @@ monitor_speed = 115200
408408
# STM32F4 with STM32GENERIC
409409
#
410410
[env:STM32F4]
411-
platform = ststm32
411+
platform = ststm32@<6.2.0
412412
board = disco_f407vg
413413
build_flags = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F4 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED
414414
lib_ignore = Adafruit NeoPixel, TMCStepper
@@ -418,7 +418,7 @@ src_filter = ${common.default_src_filter} +<src/HAL/STM32_F4_F7> -<src/HAL/ST
418418
# STM32F7 with STM32GENERIC
419419
#
420420
[env:STM32F7]
421-
platform = ststm32
421+
platform = ststm32@<6.2.0
422422
board = remram_v1
423423
build_flags = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F7 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED
424424
lib_ignore = Adafruit NeoPixel, TMCStepper
@@ -428,7 +428,7 @@ src_filter = ${common.default_src_filter} +<src/HAL/STM32_F4_F7> -<src/HAL/ST
428428
# ARMED (STM32)
429429
#
430430
[env:ARMED]
431-
platform = ststm32
431+
platform = ststm32@<6.2.0
432432
board = armed_v1
433433
build_flags = ${common.build_flags}
434434
-DUSBCON -DUSBD_VID=0x0483 '-DUSB_MANUFACTURER="Unknown"' '-DUSB_PRODUCT="ARMED_V1"' -DUSBD_USE_CDC
@@ -441,7 +441,7 @@ src_filter = ${common.default_src_filter} +<src/HAL/STM32>
441441
# Geeetech GTM32 (STM32F103VET6)
442442
#
443443
[env:STM32F103VE_GTM32]
444-
platform = ststm32
444+
platform = ststm32@<6.2.0
445445
board = genericSTM32F103VE
446446
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
447447
${common.build_flags} -DDEBUG_LEVEL=DEBUG_NONE -std=gnu++14 -MMD -ffunction-sections -fdata-sections -nostdlib
@@ -456,7 +456,7 @@ upload_protocol = serial
456456
# Longer 3D board in Alfawise U20 (STM32F103VET6)
457457
#
458458
[env:STM32F103VE_longer]
459-
platform = ststm32
459+
platform = ststm32@<6.2.0
460460
board = genericSTM32F103VE
461461
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
462462
${common.build_flags} -std=gnu++14 -USERIAL_USB
@@ -470,7 +470,7 @@ lib_ignore = Adafruit NeoPixel, LiquidTWI2, SPI
470470
# MKS Robin Mini (STM32F103VET6)
471471
#
472472
[env:mks_robin_mini]
473-
platform = ststm32
473+
platform = ststm32@<6.2.0
474474
board = genericSTM32F103VE
475475
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
476476
${common.build_flags} -std=gnu++14
@@ -483,7 +483,7 @@ lib_ignore = Adafruit NeoPixel, SPI
483483
# MKS Robin Nano (STM32F103VET6)
484484
#
485485
[env:mks_robin_nano]
486-
platform = ststm32
486+
platform = ststm32@<6.2.0
487487
board = genericSTM32F103VE
488488
platform_packages = tool-stm32duino
489489
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -499,7 +499,7 @@ lib_ignore = Adafruit NeoPixel, SPI
499499
# MKS Robin (STM32F103ZET6)
500500
#
501501
[env:mks_robin]
502-
platform = ststm32
502+
platform = ststm32@<6.2.0
503503
board = genericSTM32F103ZE
504504
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
505505
${common.build_flags} -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DSTM32_XL_DENSITY
@@ -514,7 +514,7 @@ lib_ignore = Adafruit NeoPixel, SPI
514514
# MKS Robin Pro (STM32F103ZET6)
515515
#
516516
[env:mks_robin_pro]
517-
platform = ststm32
517+
platform = ststm32@<6.2.0
518518
board = genericSTM32F103ZE
519519
extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_pro.py
520520
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -528,7 +528,7 @@ lib_ignore = Adafruit NeoPixel, SPI, TMCStepper
528528
# MKS Robin Lite/Lite2 (STM32F103RCT6)
529529
#
530530
[env:mks_robin_lite]
531-
platform = ststm32
531+
platform = ststm32@<6.2.0
532532
board = genericSTM32F103RC
533533
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
534534
${common.build_flags} -std=gnu++14
@@ -541,7 +541,7 @@ lib_ignore = Adafruit NeoPixel, SPI
541541
# MKS ROBIN LITE3 (STM32F103RCT6)
542542
#
543543
[env:mks_robin_lite3]
544-
platform = ststm32
544+
platform = ststm32@<6.2.0
545545
board = genericSTM32F103RC
546546
extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
547547
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -555,7 +555,7 @@ lib_ignore = Adafruit NeoPixel, SPI
555555
# JGAurora A5S A1 (STM32F103ZET6)
556556
#
557557
[env:jgaurora_a5s_a1]
558-
platform = ststm32
558+
platform = ststm32@<6.2.0
559559
board = genericSTM32F103ZE
560560
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
561561
${common.build_flags} -DSTM32F1xx -std=gnu++14 -DSTM32_XL_DENSITY
@@ -568,7 +568,7 @@ lib_ignore = Adafruit NeoPixel, SPI
568568
# Malyan M200 (STM32F103CB)
569569
#
570570
[env:STM32F103CB_malyan]
571-
platform = ststm32
571+
platform = ststm32@<6.2.0
572572
board = malyanM200
573573
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py -DMCU_STM32F103CB -D __STM32F1__=1 -std=c++1y -D MOTHERBOARD="BOARD_MALYAN_M200" -DSERIAL_USB -ffunction-sections -fdata-sections -Wl,--gc-sections
574574
-DDEBUG_LEVEL=0 -D__MARLIN_FIRMWARE__
@@ -579,7 +579,7 @@ lib_ignore = Adafruit NeoPixel, LiquidCrystal, LiquidTWI2, TMCStepper, U8glib-H
579579
# Chitu boards like Tronxy X5s (STM32F103ZET6)
580580
#
581581
[env:chitu_f103]
582-
platform = ststm32
582+
platform = ststm32@<6.2.0
583583
board = genericSTM32F103ZE
584584
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
585585
${common.build_flags} -DSTM32F1xx -std=gnu++14 -DSTM32_XL_DENSITY
@@ -593,7 +593,7 @@ lib_ignore = Adafruit NeoPixel
593593
# 'STEVAL-3DP001V1' STM32F401VE board - https://www.st.com/en/evaluation-tools/steval-3dp001v1.html
594594
#
595595
[env:STM32F401VE_STEVAL]
596-
platform = ststm32
596+
platform = ststm32@<6.2.0
597597
board = STEVAL_STM32F401VE
598598
platform_packages = framework-arduinoststm32@>=3.107,<4
599599
build_flags = ${common.build_flags}
@@ -611,7 +611,7 @@ src_filter = ${common.default_src_filter} +<src/HAL/STM32>
611611
# FLYF407ZG
612612
#
613613
[env:FLYF407ZG]
614-
platform = ststm32
614+
platform = ststm32@<6.2.0
615615
board = FLYF407ZG
616616
platform_packages = framework-arduinoststm32@>=3.107,<4
617617
build_flags = ${common.build_flags}
@@ -628,7 +628,7 @@ src_filter = ${common.default_src_filter} +<src/HAL/STM32>
628628
# FYSETC S6 (STM32F446VET6 ARM Cortex-M4)
629629
#
630630
[env:FYSETC_S6]
631-
platform = ststm32
631+
platform = ststm32@<6.2.0
632632
board = fysetc_s6
633633
platform_packages =
634634
tool-stm32duino
@@ -651,7 +651,7 @@ upload_protocol = serial
651651
# Shield - https://github.com/jmz52/Hardware
652652
#
653653
[env:STM32F407VE_black]
654-
platform = ststm32
654+
platform = ststm32@<6.2.0
655655
board = blackSTM32F407VET6
656656
platform_packages = framework-arduinoststm32@>=3.107,<4
657657
build_flags = ${common.build_flags}
@@ -667,7 +667,7 @@ src_filter = ${common.default_src_filter} +<src/HAL/STM32>
667667
# BigTreeTech SKR Pro (STM32F407ZGT6 ARM Cortex-M4)
668668
#
669669
[env:BIGTREE_SKR_PRO]
670-
platform = ststm32
670+
platform = ststm32@<6.2.0
671671
board = BigTree_SKR_Pro
672672
platform_packages = framework-arduinoststm32@>=3.107,<4
673673
build_flags = ${common.build_flags}
@@ -687,7 +687,7 @@ debug_init_break =
687687
# Bigtreetech GTR V1.0 (STM32F407IGT6 ARM Cortex-M4)
688688
#
689689
[env:BIGTREE_GTR_V1_0]
690-
platform = ststm32@>=5.7.0
690+
platform = ststm32@>=5.7.0,<6.2.0
691691
framework = arduino
692692
platform_packages = framework-arduinoststm32@>=3.107,<4
693693
board = BigTree_SKR_Pro
@@ -799,7 +799,7 @@ debug_tool = jlink
799799
# RUMBA32
800800
#
801801
[env:rumba32_f446ve]
802-
platform = ststm32
802+
platform = ststm32@<6.2.0
803803
board = rumba32_f446ve
804804
build_flags = ${common.build_flags}
805805
-DSTM32F4xx
@@ -825,7 +825,7 @@ upload_protocol = dfu
825825
# MKS RUMBA32 (adds TMC2208/2209 UART interface and AUX-1)
826826
#
827827
[env:rumba32_mks]
828-
platform = ststm32
828+
platform = ststm32@<6.2.0
829829
board = rumba32_f446ve
830830
build_flags = ${common.build_flags}
831831
-DSTM32F4xx -DARDUINO_RUMBA32_F446VE -DARDUINO_ARCH_STM32 "-DBOARD_NAME=\"RUMBA32_F446VE\""

0 commit comments

Comments
 (0)