CI Helperscript angepasst

include/defines.h

@@ -10,11 +10,12 @@
 #include "bscTime.h"
 
 
-#define FW_T1 0
-#define FW_T2 6
-#define FW_T3 1
+#define FW_MAJOR 0
+#define FW_MINOR 6
+#define FW_PATCH 1
+#define FW_ADDITION "" // z.B.: _T1
 
-#define BSC_SW_VERSION TOSTRING(V##FW_T1.FW_T2.FW_T3)
+#define BSC_SW_VERSION TOSTRING(V##FW_MAJOR.FW_MINOR.FW_PATCH##FW_ADDITION)
 
 
 static const char COMPILE_DATE_TIME[] = "";

scripts/githubCI.py

@@ -1,12 +1,15 @@
 # Copyright (c) 2024 Tobias Himmler
-# 
+#
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
 import os
 
 env_file = os.getenv('GITHUB_ENV')
 
+fwMajor = ""
+fwMinor = ""
+fwPatch = ""
 
 datei = open('./include/defines.h','r')
 for zeile in datei:
@@ -17,10 +20,19 @@
             defName = defs[1].strip()
             defValue = defs[2].strip().replace('"', '')
 
-            if(defName == "BSC_SW_VERSION"):
-                defValue=defValue.lower()
-                print(defName+"="+defValue)
+            if(defName == "FW_MAJOR"):
+                fwMajor = defValue.lower()
+
+            if(defName == "FW_MINOR"):
+                fwMinor = defValue.lower()
+
+            if(defName == "FW_PATCH"):
+                fwPatch = defValue.lower()
+
+            if(defName == "FW_ADDITION"):
+                defValue = "v" + fwMajor + "." + fwMinor + "." + fwPatch + defValue.lower()
+                print(defName + "=" + defValue)
                 with open(env_file, "a") as myfile:
-                    myfile.write(defName+"="+defValue)
+                    myfile.write(defName + "=" + defValue)
 
 datei.close()