Browse Source

Update to STM32 v10, optimize build (#20325)

Mathias Rasmussen 4 years ago
parent
commit
753cf994b6
No account linked to committer's email address
1 changed files with 10 additions and 15 deletions
  1. 10
    15
      platformio.ini

+ 10
- 15
platformio.ini View File

@@ -722,7 +722,7 @@ board    = nxp_lpc1769
722 722
 # HAL/STM32 Base Environment values
723 723
 #
724 724
 [common_stm32]
725
-platform      = ststm32@~8.0
725
+platform      = ststm32@~10.0
726 726
 build_flags   = ${common.build_flags}
727 727
   -std=gnu++14
728 728
   -DUSBCON -DUSBD_USE_CDC
@@ -734,14 +734,17 @@ src_filter    = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/shared/b
734 734
 # HAL/STM32F1 Common Environment values
735 735
 #
736 736
 [common_stm32f1]
737
-platform      = ststm32@~6.1
738
-build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
737
+platform          = ststm32@~10.0
738
+board_build.core  = maple
739
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
739 740
   ${common.build_flags}
740
-build_unflags = -std=gnu11 -std=gnu++11
741
-src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
742
-lib_ignore    = SPI
743
-lib_deps      = ${common.lib_deps}
741
+  -DARDUINO_ARCH_STM32
742
+build_unflags     = -std=gnu11 -std=gnu++11
743
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
744
+lib_ignore        = SPI, FreeRTOS701, FreeRTOS821
745
+lib_deps          = ${common.lib_deps}
744 746
   SoftwareSerialM
747
+platform_packages = tool-stm32duino
745 748
 
746 749
 #
747 750
 # STM32F103RC
@@ -750,7 +753,6 @@ lib_deps      = ${common.lib_deps}
750 753
 platform          = ${common_stm32f1.platform}
751 754
 extends           = common_stm32f1
752 755
 board             = genericSTM32F103RC
753
-platform_packages = tool-stm32duino
754 756
 monitor_speed     = 115200
755 757
 
756 758
 #
@@ -760,7 +762,6 @@ monitor_speed     = 115200
760 762
 platform          = ${common_stm32f1.platform}
761 763
 extends           = common_stm32f1
762 764
 board             = MEEB_3DP
763
-platform_packages = tool-stm32duino
764 765
 build_flags       = ${common_stm32f1.build_flags}
765 766
                     -DDEBUG_LEVEL=0
766 767
                     -DSS_TIMER=4
@@ -842,7 +843,6 @@ lib_deps          = ${env:STM32F103RC_btt_512K.lib_deps}
842 843
 platform          = ${common_stm32f1.platform}
843 844
 extends           = common_stm32f1
844 845
 board             = genericSTM32F103RE
845
-platform_packages = tool-stm32duino
846 846
 monitor_speed     = 115200
847 847
 
848 848
 #
@@ -922,7 +922,6 @@ build_flags   = ${common_stm32f1.build_flags}
922 922
   -DMCU_STM32F103VE -DSTM32F1xx -USERIAL_USB -DU20 -DTS_V12
923 923
 build_unflags = ${common_stm32f1.build_unflags}
924 924
   -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
925
-lib_ignore    = ${common_stm32f1.lib_ignore}
926 925
 
927 926
 #
928 927
 # MKS Robin Mini (STM32F103VET6)
@@ -943,7 +942,6 @@ build_flags   = ${common_stm32f1.build_flags}
943 942
 platform        = ${common_stm32f1.platform}
944 943
 extends         = common_stm32f1
945 944
 board           = genericSTM32F103VE
946
-platform_packages = tool-stm32duino
947 945
 extra_scripts   = ${common.extra_scripts}
948 946
   buildroot/share/PlatformIO/scripts/mks_robin_nano35.py
949 947
 build_flags     = ${common_stm32f1.build_flags}
@@ -1024,7 +1022,6 @@ build_flags   = ${common_stm32f1.build_flags}
1024 1022
 platform        = ${common_stm32f1.platform}
1025 1023
 extends         = common_stm32f1
1026 1024
 board           = genericSTM32F103VE
1027
-platform_packages = tool-stm32duino
1028 1025
 extra_scripts   = ${common.extra_scripts}
1029 1026
   buildroot/share/PlatformIO/scripts/mks_robin_e3p.py
1030 1027
 build_flags     = ${common_stm32f1.build_flags}
@@ -1153,7 +1150,6 @@ upload_protocol = jlink
1153 1150
 platform          = ${common_stm32f1.platform}
1154 1151
 extends           = common_stm32f1
1155 1152
 board             = genericSTM32F103VE
1156
-platform_packages = tool-stm32duino
1157 1153
 extra_scripts     = ${common.extra_scripts}
1158 1154
   buildroot/share/PlatformIO/scripts/mks_robin_mini.py
1159 1155
   buildroot/share/PlatformIO/scripts/add_nanolib.py
@@ -1195,7 +1191,6 @@ extra_scripts     = ${common.extra_scripts}
1195 1191
 platform          = ${common_stm32f1.platform}
1196 1192
 extends           = common_stm32f1
1197 1193
 board             = genericSTM32F103RC
1198
-platform_packages = tool-stm32duino
1199 1194
 extra_scripts     = ${common.extra_scripts}
1200 1195
  buildroot/share/PlatformIO/scripts/fly_mini.py
1201 1196
 build_flags       = ${common_stm32f1.build_flags}

Loading…
Cancel
Save