build system simplyfied after upstream commit

ThomasToka · Jun 11, 2023 · 361ee45 · 361ee45
1 parent ad3b7c4
commit 361ee45
Show file tree

Hide file tree

Showing 21 changed files with 31 additions and 222 deletions.
diff --git a/buildroot/share/PlatformIO/scripts/random-bin-e3s1-abl5x5-F1.py b/buildroot/share/PlatformIO/scripts/random-bin-e3s1-abl5x5-F1.py
diff --git a/buildroot/share/PlatformIO/scripts/random-bin-e3s1-abl5x5-F4.py b/buildroot/share/PlatformIO/scripts/random-bin-e3s1-abl5x5-F4.py
diff --git a/buildroot/share/PlatformIO/scripts/random-bin-e3s1plus-abl5x5-F1.py b/buildroot/share/PlatformIO/scripts/random-bin-e3s1plus-abl5x5-F1.py
diff --git a/buildroot/share/PlatformIO/scripts/random-bin-e3s1plus-abl5x5-F4.py b/buildroot/share/PlatformIO/scripts/random-bin-e3s1plus-abl5x5-F4.py
diff --git a/buildroot/share/PlatformIO/scripts/random-bin-e3s1plus-ubl10x10-F1.py b/buildroot/share/PlatformIO/scripts/random-bin-e3s1plus-ubl10x10-F1.py
diff --git a/buildroot/share/PlatformIO/scripts/random-bin-e3s1plus-ubl10x10-F4.py b/buildroot/share/PlatformIO/scripts/random-bin-e3s1plus-ubl10x10-F4.py
diff --git a/buildroot/share/PlatformIO/scripts/random-bin-e3s1plus-ubl5x5-F1.py b/buildroot/share/PlatformIO/scripts/random-bin-e3s1plus-ubl5x5-F1.py
diff --git a/buildroot/share/PlatformIO/scripts/random-bin-e3s1plus-ubl5x5-F4.py b/buildroot/share/PlatformIO/scripts/random-bin-e3s1plus-ubl5x5-F4.py
diff --git a/buildroot/share/PlatformIO/scripts/random-bin-e3s1plus-ubl7x7-F1.py b/buildroot/share/PlatformIO/scripts/random-bin-e3s1plus-ubl7x7-F1.py
diff --git a/buildroot/share/PlatformIO/scripts/random-bin-e3s1plus-ubl7x7-F4.py b/buildroot/share/PlatformIO/scripts/random-bin-e3s1plus-ubl7x7-F4.py
diff --git a/buildroot/share/PlatformIO/scripts/random-bin-e3s1pro-abl5x5-F1.py b/buildroot/share/PlatformIO/scripts/random-bin-e3s1pro-abl5x5-F1.py
diff --git a/buildroot/share/PlatformIO/scripts/random-bin-e3s1pro-abl5x5-F4.py b/buildroot/share/PlatformIO/scripts/random-bin-e3s1pro-abl5x5-F4.py
diff --git a/buildroot/share/PlatformIO/scripts/random-bin-e3s1pro-abl5x5-personal-F4.py b/buildroot/share/PlatformIO/scripts/random-bin-e3s1pro-abl5x5-personal-F4.py
diff --git a/buildroot/share/PlatformIO/scripts/random-bin-e3s1pro-ubl10x10-F1.py b/buildroot/share/PlatformIO/scripts/random-bin-e3s1pro-ubl10x10-F1.py
diff --git a/buildroot/share/PlatformIO/scripts/random-bin-e3s1pro-ubl10x10-F4.py b/buildroot/share/PlatformIO/scripts/random-bin-e3s1pro-ubl10x10-F4.py
diff --git a/buildroot/share/PlatformIO/scripts/random-bin-e3s1pro-ubl5x5-F1.py b/buildroot/share/PlatformIO/scripts/random-bin-e3s1pro-ubl5x5-F1.py
diff --git a/buildroot/share/PlatformIO/scripts/random-bin-e3s1pro-ubl5x5-F4.py b/buildroot/share/PlatformIO/scripts/random-bin-e3s1pro-ubl5x5-F4.py
diff --git a/buildroot/share/PlatformIO/scripts/random-bin-e3s1pro-ubl7x7-F1.py b/buildroot/share/PlatformIO/scripts/random-bin-e3s1pro-ubl7x7-F1.py
diff --git a/buildroot/share/PlatformIO/scripts/random-bin-e3s1pro-ubl7x7-F4.py b/buildroot/share/PlatformIO/scripts/random-bin-e3s1pro-ubl7x7-F4.py
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
@@ -180,8 +180,7 @@ build_flags                 = ${STM32F103Rx_creality.build_flags}
                               -DUSER_STM32F103=1
                               -DMOTHERBOARD=BOARD_CREALITY_V24S1_301
                               -DPROBING_MARGIN=45
-extra_scripts               = ${stm32_variant.extra_scripts}
-                              pre:buildroot/share/PlatformIO/scripts/random-bin-e3s1pro-abl5x5-F1.py                               
+board_build.rename            = firmware-{date}-{time}-E3S1Pro-abl5x5-LA-F1.bin                           
 
 [env:STM32F103RE_creality_e3s1pro_ubl5x5]
 extends                     = env:STM32F103RE_creality
@@ -194,9 +193,8 @@ build_flags                 = ${STM32F103Rx_creality.build_flags}
                               -DUSER_STM32F103=1
                               -DMOTHERBOARD=BOARD_CREALITY_V24S1_301   
                               -DMESH_INSET_X=27                             
-                              -DMESH_INSET_Y=45                          
-extra_scripts               = ${stm32_variant.extra_scripts}
-                              pre:buildroot/share/PlatformIO/scripts/random-bin-e3s1pro-ubl5x5-F1.py                                                             
+                              -DMESH_INSET_Y=45
+board_build.rename            = firmware-{date}-{time}-E3S1Pro-ubl5x5-LA-F1.bin                                                            
 
 [env:STM32F103RE_creality_e3s1pro_ubl7x7]
 extends                     = env:STM32F103RE_creality
@@ -208,10 +206,8 @@ build_flags                 = ${STM32F103Rx_creality.build_flags}
                               -DUSER_STM32F103=1
                               -DMOTHERBOARD=BOARD_CREALITY_V24S1_301
                               -DMESH_INSET_X=27                             
-                              -DMESH_INSET_Y=45                            
-extra_scripts               = ${stm32_variant.extra_scripts}
-                              pre:buildroot/share/PlatformIO/scripts/random-bin-e3s1pro-ubl7x7-F1.py                                                             
-
+                              -DMESH_INSET_Y=45
+board_build.rename            = firmware-{date}-{time}-E3S1Pro-ubl7x7-LA-F1.bin
 
 [env:STM32F103RE_creality_e3s1pro_ubl10x10]
 extends                     = env:STM32F103RE_creality
@@ -223,9 +219,8 @@ build_flags                 = ${STM32F103Rx_creality.build_flags}
                               -DUSER_STM32F103=1
                               -DMOTHERBOARD=BOARD_CREALITY_V24S1_301  
                               -DMESH_INSET_X=27                             
-                              -DMESH_INSET_Y=45                           
-extra_scripts               = ${stm32_variant.extra_scripts}
-                              pre:buildroot/share/PlatformIO/scripts/random-bin-e3s1pro-ubl10x10-F1.py                                                             
+                              -DMESH_INSET_Y=45
+board_build.rename            = firmware-{date}-{time}-E3S1Pro-ub10x10-LA-F1.bin
 
 [env:STM32F103RE_creality_e3s1plus_abl5x5]
 extends                     = env:STM32F103RE_creality
@@ -237,9 +232,8 @@ build_flags                 = ${STM32F103Rx_creality.build_flags}
                               -DBLTOUCH_HS_MODE=true
                               -DUSER_STM32F103=1
                               -DMOTHERBOARD=BOARD_CREALITY_V24S1_301 
-                              -DPROBING_MARGIN=45                             
-extra_scripts               = ${stm32_variant.extra_scripts}
-                              pre:buildroot/share/PlatformIO/scripts/random-bin-e3s1plus-abl5x5-F1.py                                                             
+                              -DPROBING_MARGIN=45
+board_build.rename            = firmware-{date}-{time}-E3S1Plus-abl5x5-LA-F1.bin
 
 [env:STM32F103RE_creality_e3s1plus_ubl5x5]
 extends                     = env:STM32F103RE_creality
@@ -252,9 +246,8 @@ build_flags                 = ${STM32F103Rx_creality.build_flags}
                               -DUSER_STM32F103=1
                               -DMOTHERBOARD=BOARD_CREALITY_V24S1_301
                               -DMESH_INSET_X=27                             
-                              -DMESH_INSET_Y=45                     
-extra_scripts               = ${stm32_variant.extra_scripts}
-                              pre:buildroot/share/PlatformIO/scripts/random-bin-e3s1plus-ubl5x5-F1.py                                                             
+                              -DMESH_INSET_Y=45
+board_build.rename            = firmware-{date}-{time}-E3S1Plus-ubl5x5-LA-F1.bin
 
 [env:STM32F103RE_creality_e3s1plus_ubl7x7]
 extends                     = env:STM32F103RE_creality
@@ -266,9 +259,8 @@ build_flags                 = ${STM32F103Rx_creality.build_flags}
                               -DUSER_STM32F103=1
                               -DMOTHERBOARD=BOARD_CREALITY_V24S1_301
                               -DMESH_INSET_X=27                             
-                              -DMESH_INSET_Y=45                           
-extra_scripts               = ${stm32_variant.extra_scripts}
-                              pre:buildroot/share/PlatformIO/scripts/random-bin-e3s1plus-ubl7x7-F1.py                                                             
+                              -DMESH_INSET_Y=45
+board_build.rename            = firmware-{date}-{time}-E3S1Plus-ubl7x7-LA-F1.bin
 
 [env:STM32F103RE_creality_e3s1plus_ubl10x10]
 extends                     = env:STM32F103RE_creality
@@ -280,9 +272,8 @@ build_flags                 = ${STM32F103Rx_creality.build_flags}
                               -DUSER_STM32F103=1
                               -DMOTHERBOARD=BOARD_CREALITY_V24S1_301
                               -DMESH_INSET_X=27                             
-                              -DMESH_INSET_Y=45                   
-extra_scripts               = ${stm32_variant.extra_scripts}
-                              pre:buildroot/share/PlatformIO/scripts/random-bin-e3s1plus-ubl10x10-F1.py      
+                              -DMESH_INSET_Y=45
+board_build.rename            = firmware-{date}-{time}-E3S1Plus-ubl10x10-LA-F1.bin
 
 [env:STM32F103RE_creality_e3s1_abl5x5]
 extends                     = env:STM32F103RE_creality
@@ -296,8 +287,7 @@ build_flags                 = ${STM32F103Rx_creality.build_flags}
                               -DMOTHERBOARD=BOARD_CREALITY_V24S1_301
                               -DMESH_INSET_X=27                             
                               -DMESH_INSET_Y=45
-extra_scripts               = ${stm32_variant.extra_scripts}
-                              pre:buildroot/share/PlatformIO/scripts/random-bin-e3s1-abl5x5-F1.py   
+board_build.rename            = firmware-{date}-{time}-E3S1-abl5x5-LA-F1.bin
 
 #
 # Trigorilla V0.0.6 (GD32F103)