Merge pull request #16 from maxgerhardt/master

Update PlatformIO build to use new platform
EFeru · Aug 19, 2021 · 7fca71b · 7fca71b
2 parents 1842991 + a62ecb6
commit 7fca71b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 65 deletions.
diff --git a/add_nanolib.py b/add_nanolib.py
diff --git a/boards/gd32f130c6.json b/boards/gd32f130c6.json
diff --git a/platformio.ini b/platformio.ini
@@ -20,17 +20,19 @@ src_dir     = Src
 ;================================================================
 
 [env]
-platform_packages = maxgerhardt/framework-spl@2.10301.0     ; Add GD32 support package: globally override framework-spl for all environments
+; use new GD32 platform and the bleeding-edge SPL package for it
+platform = https://github.com/CommunityGD32Cores/platform-gd32.git
+platform_packages = 
+    framework-spl-gd32@https://github.com/CommunityGD32Cores/gd32-pio-spl-package.git
 
 ;================================================================
 
 [env:VARIANT_DEBUG]
-platform        = ststm32
-board           = gd32f130c6
+board           = genericGD32F130C6
 debug_tool      = stlink
 upload_protocol = stlink
 framework       = spl
-extra_scripts   = add_nanolib.py        ; adds nanolib to reduce printf memory foot print
+board_build.ldscript = ./GD32F130C6T_FLASH.ld
 
 
 ; Serial Port settings (make sure the COM port is correct)
@@ -41,53 +43,39 @@ build_flags =
     -IInc
     -ISrc 
     -DUSE_STDPERIPH_DRIVER
-    -DGD32F130_150
-    -T./GD32F130C6T_FLASH.ld
-    -lc
-    -lm
     -g -ggdb
     -D VARIANT_DEBUG
 
 
 ;================================================================
 
 [env:VARIANT_HOVERCAR]
-platform        = ststm32
-board           = gd32f130c6
+board           = genericGD32F130C6
 debug_tool      = stlink
 upload_protocol = stlink
 framework       = spl
-extra_scripts   = add_nanolib.py
+board_build.ldscript = ./GD32F130C6T_FLASH.ld
 
 build_flags =
     -IInc
     -ISrc 
     -DUSE_STDPERIPH_DRIVER
-    -DGD32F130_150
-    -T./GD32F130C6T_FLASH.ld
-    -lc
-    -lm
     -g -ggdb
     -D VARIANT_HOVERCAR
 
 ;================================================================
 
 [env:VARIANT_HOVERBOARD]
-platform        = ststm32
-board           = gd32f130c6
+board           = genericGD32F130C6
 debug_tool      = stlink
 upload_protocol = stlink
 framework       = spl
-extra_scripts   = add_nanolib.py
+board_build.ldscript = ./GD32F130C6T_FLASH.ld
 
 build_flags =
     -IInc
     -ISrc 
     -DUSE_STDPERIPH_DRIVER
-    -DGD32F130_150
-    -T./GD32F130C6T_FLASH.ld
-    -lc
-    -lm
     -g -ggdb
     -D VARIANT_HOVERBOARD