Sfoglia il codice sorgente

2.0.5.4 : Use ststm32 < 6.2

Scott Lahteine 4 anni fa
parent
commit
5513e67512
3 ha cambiato i file con 35 aggiunte e 35 eliminazioni
  1. 2
    2
      Marlin/Version.h
  2. 2
    2
      Marlin/src/inc/Version.h
  3. 31
    31
      platformio.ini

+ 2
- 2
Marlin/Version.h Vedi File

@@ -28,7 +28,7 @@
28 28
 /**
29 29
  * Marlin release version identifier
30 30
  */
31
-//#define SHORT_BUILD_VERSION "2.0.5.3"
31
+//#define SHORT_BUILD_VERSION "2.0.5.4"
32 32
 
33 33
 /**
34 34
  * Verbose version identifier which should contain a reference to the location
@@ -41,7 +41,7 @@
41 41
  * here we define this default string as the date where the latest release
42 42
  * version was tagged.
43 43
  */
44
-//#define STRING_DISTRIBUTION_DATE "2020-01-31"
44
+//#define STRING_DISTRIBUTION_DATE "2020-07-09"
45 45
 
46 46
 /**
47 47
  * Defines a generic printer name to be output to the LCD after booting Marlin.

+ 2
- 2
Marlin/src/inc/Version.h Vedi File

@@ -25,7 +25,7 @@
25 25
  * Release version. Leave the Marlin version or apply a custom scheme.
26 26
  */
27 27
 #ifndef SHORT_BUILD_VERSION
28
-  #define SHORT_BUILD_VERSION "2.0.5.3"
28
+  #define SHORT_BUILD_VERSION "2.0.5.4"
29 29
 #endif
30 30
 
31 31
 /**
@@ -42,7 +42,7 @@
42 42
  * version was tagged.
43 43
  */
44 44
 #ifndef STRING_DISTRIBUTION_DATE
45
-  #define STRING_DISTRIBUTION_DATE "2020-03-31"
45
+  #define STRING_DISTRIBUTION_DATE "2020-07-09"
46 46
 #endif
47 47
 
48 48
 /**

+ 31
- 31
platformio.ini Vedi File

@@ -249,7 +249,7 @@ lib_deps          = Servo
249 249
 # STM32F103RC
250 250
 #
251 251
 [env:STM32F103RC]
252
-platform          = ststm32
252
+platform          = ststm32@<6.2.0
253 253
 board             = genericSTM32F103RC
254 254
 platform_packages = tool-stm32duino
255 255
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -265,7 +265,7 @@ monitor_speed     = 115200
265 265
 # STM32F103RC_fysetc
266 266
 #
267 267
 [env:STM32F103RC_fysetc]
268
-platform          = ststm32
268
+platform          = ststm32@<6.2.0
269 269
 board             = genericSTM32F103RC
270 270
 #board_build.core = maple
271 271
 platform_packages = tool-stm32duino
@@ -291,7 +291,7 @@ upload_protocol   = serial
291 291
 #
292 292
 
293 293
 [env:STM32F103RC_btt]
294
-platform          = ststm32
294
+platform          = ststm32@<6.2.0
295 295
 board             = genericSTM32F103RC
296 296
 platform_packages = tool-stm32duino
297 297
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -306,7 +306,7 @@ lib_ignore        = Adafruit NeoPixel, SPI
306 306
 monitor_speed     = 115200
307 307
 
308 308
 [env:STM32F103RC_btt_USB]
309
-platform          = ststm32
309
+platform          = ststm32@<6.2.0
310 310
 board             = genericSTM32F103RC
311 311
 platform_packages = tool-stm32duino
312 312
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -321,7 +321,7 @@ lib_ignore        = Adafruit NeoPixel, SPI
321 321
 monitor_speed     = 115200
322 322
 
323 323
 [env:STM32F103RC_btt_512K]
324
-platform          = ststm32
324
+platform          = ststm32@<6.2.0
325 325
 board             = genericSTM32F103RC
326 326
 board_upload.maximum_size=524288
327 327
 platform_packages = tool-stm32duino
@@ -337,7 +337,7 @@ lib_ignore        = Adafruit NeoPixel, SPI
337 337
 monitor_speed     = 115200
338 338
 
339 339
 [env:STM32F103RC_btt_512K_USB]
340
-platform          = ststm32
340
+platform          = ststm32@<6.2.0
341 341
 board             = genericSTM32F103RC
342 342
 board_upload.maximum_size=524288
343 343
 platform_packages = tool-stm32duino
@@ -356,7 +356,7 @@ monitor_speed     = 115200
356 356
 # STM32F103RE
357 357
 #
358 358
 [env:STM32F103RE]
359
-platform          = ststm32
359
+platform          = ststm32@<6.2.0
360 360
 board             = genericSTM32F103RE
361 361
 platform_packages = tool-stm32duino
362 362
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -373,7 +373,7 @@ monitor_speed     = 115200
373 373
 #   STM32F103RE_btt_USB ......... RET6 (USB mass storage)
374 374
 #
375 375
 [env:STM32F103RE_btt]
376
-platform          = ststm32
376
+platform          = ststm32@<6.2.0
377 377
 board             = genericSTM32F103RE
378 378
 platform_packages = tool-stm32duino
379 379
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -389,7 +389,7 @@ upload_protocol   = stlink
389 389
 monitor_speed     = 115200
390 390
 
391 391
 [env:STM32F103RE_btt_USB]
392
-platform          = ststm32
392
+platform          = ststm32@<6.2.0
393 393
 board             = genericSTM32F103RE
394 394
 platform_packages = tool-stm32duino
395 395
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -408,7 +408,7 @@ monitor_speed     = 115200
408 408
 # STM32F4 with STM32GENERIC
409 409
 #
410 410
 [env:STM32F4]
411
-platform      = ststm32
411
+platform      = ststm32@<6.2.0
412 412
 board         = disco_f407vg
413 413
 build_flags   = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F4 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED
414 414
 lib_ignore    = Adafruit NeoPixel, TMCStepper
@@ -418,7 +418,7 @@ src_filter    = ${common.default_src_filter} +<src/HAL/STM32_F4_F7> -<src/HAL/ST
418 418
 # STM32F7 with STM32GENERIC
419 419
 #
420 420
 [env:STM32F7]
421
-platform      = ststm32
421
+platform      = ststm32@<6.2.0
422 422
 board         = remram_v1
423 423
 build_flags   = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F7 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED
424 424
 lib_ignore    = Adafruit NeoPixel, TMCStepper
@@ -428,7 +428,7 @@ src_filter    = ${common.default_src_filter} +<src/HAL/STM32_F4_F7> -<src/HAL/ST
428 428
 # ARMED (STM32)
429 429
 #
430 430
 [env:ARMED]
431
-platform      = ststm32
431
+platform      = ststm32@<6.2.0
432 432
 board         = armed_v1
433 433
 build_flags   = ${common.build_flags}
434 434
   -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>
441 441
 # Geeetech GTM32 (STM32F103VET6)
442 442
 #
443 443
 [env:STM32F103VE_GTM32]
444
-platform        = ststm32
444
+platform        = ststm32@<6.2.0
445 445
 board           = genericSTM32F103VE
446 446
 build_flags     = !python Marlin/src/HAL/STM32F1/build_flags.py
447 447
   ${common.build_flags} -DDEBUG_LEVEL=DEBUG_NONE -std=gnu++14 -MMD -ffunction-sections -fdata-sections -nostdlib
@@ -456,7 +456,7 @@ upload_protocol = serial
456 456
 # Longer 3D board in Alfawise U20 (STM32F103VET6)
457 457
 #
458 458
 [env:STM32F103VE_longer]
459
-platform      = ststm32
459
+platform      = ststm32@<6.2.0
460 460
 board         = genericSTM32F103VE
461 461
 build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
462 462
   ${common.build_flags} -std=gnu++14 -USERIAL_USB
@@ -470,7 +470,7 @@ lib_ignore    = Adafruit NeoPixel, LiquidTWI2, SPI
470 470
 # MKS Robin Mini (STM32F103VET6)
471 471
 #
472 472
 [env:mks_robin_mini]
473
-platform      = ststm32
473
+platform      = ststm32@<6.2.0
474 474
 board         = genericSTM32F103VE
475 475
 build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
476 476
   ${common.build_flags} -std=gnu++14
@@ -483,7 +483,7 @@ lib_ignore    = Adafruit NeoPixel, SPI
483 483
 # MKS Robin Nano (STM32F103VET6)
484 484
 #
485 485
 [env:mks_robin_nano]
486
-platform      = ststm32
486
+platform      = ststm32@<6.2.0
487 487
 board         = genericSTM32F103VE
488 488
 platform_packages = tool-stm32duino
489 489
 build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -499,7 +499,7 @@ lib_ignore    = Adafruit NeoPixel, SPI
499 499
 # MKS Robin (STM32F103ZET6)
500 500
 #
501 501
 [env:mks_robin]
502
-platform      = ststm32
502
+platform      = ststm32@<6.2.0
503 503
 board         = genericSTM32F103ZE
504 504
 build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
505 505
   ${common.build_flags} -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DSTM32_XL_DENSITY
@@ -514,7 +514,7 @@ lib_ignore    = Adafruit NeoPixel, SPI
514 514
 # MKS Robin Pro (STM32F103ZET6)
515 515
 #
516 516
 [env:mks_robin_pro]
517
-platform      = ststm32
517
+platform      = ststm32@<6.2.0
518 518
 board         = genericSTM32F103ZE
519 519
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_pro.py
520 520
 build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -528,7 +528,7 @@ lib_ignore    = Adafruit NeoPixel, SPI, TMCStepper
528 528
 # MKS Robin Lite/Lite2 (STM32F103RCT6)
529 529
 #
530 530
 [env:mks_robin_lite]
531
-platform      = ststm32
531
+platform      = ststm32@<6.2.0
532 532
 board         = genericSTM32F103RC
533 533
 build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
534 534
   ${common.build_flags} -std=gnu++14
@@ -541,7 +541,7 @@ lib_ignore    = Adafruit NeoPixel, SPI
541 541
 # MKS ROBIN LITE3 (STM32F103RCT6)
542 542
 #
543 543
 [env:mks_robin_lite3]
544
-platform      = ststm32
544
+platform      = ststm32@<6.2.0
545 545
 board         = genericSTM32F103RC
546 546
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
547 547
 build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -555,7 +555,7 @@ lib_ignore    = Adafruit NeoPixel, SPI
555 555
 # JGAurora A5S A1 (STM32F103ZET6)
556 556
 #
557 557
 [env:jgaurora_a5s_a1]
558
-platform      = ststm32
558
+platform      = ststm32@<6.2.0
559 559
 board         = genericSTM32F103ZE
560 560
 build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
561 561
   ${common.build_flags} -DSTM32F1xx -std=gnu++14 -DSTM32_XL_DENSITY
@@ -568,7 +568,7 @@ lib_ignore    = Adafruit NeoPixel, SPI
568 568
 # Malyan M200 (STM32F103CB)
569 569
 #
570 570
 [env:STM32F103CB_malyan]
571
-platform    = ststm32
571
+platform    = ststm32@<6.2.0
572 572
 board       = malyanM200
573 573
 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
574 574
   -DDEBUG_LEVEL=0 -D__MARLIN_FIRMWARE__
@@ -579,7 +579,7 @@ lib_ignore  = Adafruit NeoPixel, LiquidCrystal, LiquidTWI2, TMCStepper, U8glib-H
579 579
 # Chitu boards like Tronxy X5s (STM32F103ZET6)
580 580
 #
581 581
 [env:chitu_f103]
582
-platform      = ststm32
582
+platform      = ststm32@<6.2.0
583 583
 board         = genericSTM32F103ZE
584 584
 build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
585 585
   ${common.build_flags} -DSTM32F1xx -std=gnu++14 -DSTM32_XL_DENSITY
@@ -593,7 +593,7 @@ lib_ignore    = Adafruit NeoPixel
593 593
 # 'STEVAL-3DP001V1' STM32F401VE board - https://www.st.com/en/evaluation-tools/steval-3dp001v1.html
594 594
 #
595 595
 [env:STM32F401VE_STEVAL]
596
-platform          = ststm32
596
+platform          = ststm32@<6.2.0
597 597
 board             = STEVAL_STM32F401VE
598 598
 platform_packages = framework-arduinoststm32@>=3.107,<4
599 599
 build_flags       = ${common.build_flags}
@@ -611,7 +611,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
611 611
 # FLYF407ZG
612 612
 #
613 613
 [env:FLYF407ZG]
614
-platform          = ststm32
614
+platform          = ststm32@<6.2.0
615 615
 board             = FLYF407ZG
616 616
 platform_packages = framework-arduinoststm32@>=3.107,<4
617 617
 build_flags       = ${common.build_flags}
@@ -628,7 +628,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
628 628
 # FYSETC S6 (STM32F446VET6 ARM Cortex-M4)
629 629
 #
630 630
 [env:FYSETC_S6]
631
-platform          = ststm32
631
+platform          = ststm32@<6.2.0
632 632
 board             = fysetc_s6
633 633
 platform_packages =
634 634
    tool-stm32duino
@@ -651,7 +651,7 @@ upload_protocol   = serial
651 651
 # Shield - https://github.com/jmz52/Hardware
652 652
 #
653 653
 [env:STM32F407VE_black]
654
-platform          = ststm32
654
+platform          = ststm32@<6.2.0
655 655
 board             = blackSTM32F407VET6
656 656
 platform_packages = framework-arduinoststm32@>=3.107,<4
657 657
 build_flags       = ${common.build_flags}
@@ -667,7 +667,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
667 667
 # BigTreeTech SKR Pro (STM32F407ZGT6 ARM Cortex-M4)
668 668
 #
669 669
 [env:BIGTREE_SKR_PRO]
670
-platform          = ststm32
670
+platform          = ststm32@<6.2.0
671 671
 board             = BigTree_SKR_Pro
672 672
 platform_packages = framework-arduinoststm32@>=3.107,<4
673 673
 build_flags       = ${common.build_flags}
@@ -687,7 +687,7 @@ debug_init_break  =
687 687
 # Bigtreetech GTR V1.0 (STM32F407IGT6 ARM Cortex-M4)
688 688
 #
689 689
 [env:BIGTREE_GTR_V1_0]
690
-platform          = ststm32@>=5.7.0
690
+platform          = ststm32@>=5.7.0,<6.2.0
691 691
 framework         = arduino
692 692
 platform_packages = framework-arduinoststm32@>=3.107,<4
693 693
 board             = BigTree_SKR_Pro
@@ -799,7 +799,7 @@ debug_tool     = jlink
799 799
 # RUMBA32
800 800
 #
801 801
 [env:rumba32_f446ve]
802
-platform      = ststm32
802
+platform      = ststm32@<6.2.0
803 803
 board         = rumba32_f446ve
804 804
 build_flags   = ${common.build_flags}
805 805
   -DSTM32F4xx
@@ -825,7 +825,7 @@ upload_protocol = dfu
825 825
 # MKS RUMBA32 (adds TMC2208/2209 UART interface and AUX-1)
826 826
 #
827 827
 [env:rumba32_mks]
828
-platform      = ststm32
828
+platform      = ststm32@<6.2.0
829 829
 board         = rumba32_f446ve
830 830
 build_flags   = ${common.build_flags}
831 831
  -DSTM32F4xx -DARDUINO_RUMBA32_F446VE -DARDUINO_ARCH_STM32 "-DBOARD_NAME=\"RUMBA32_F446VE\""

Loading…
Annulla
Salva