fix #362 system Info checks git head, instead of build branch (#374)

pio-scripts/auto_firmware_version.py

@@ -18,10 +18,14 @@ from dulwich import porcelain
 def get_firmware_specifier_build_flag():
     try:
         build_version = porcelain.describe('.')  # '.' refers to the repository root dir
+        branch_name = porcelain.active_branch('.').decode('utf-8')
     except:
         build_version = "g0000000"
-    build_flag = "-D AUTO_GIT_HASH=\\\"" + build_version + "\\\""
+        branch_name = ""
+    build_flag = "-D AUTO_GIT_HASH=\\\"" + build_version + "\\\" "
+    build_flag += "-D AUTO_GIT_BRANCH=\\\"" + branch_name + "\\\""
     print ("Firmware Revision: " + build_version)
+    print ("Firmware build on branch: " + branch_name)
     return (build_flag)
 
 env.Append(

src/WebApi_sysstatus.cpp

@@ -16,6 +16,10 @@
 #define AUTO_GIT_HASH ""
 #endif
 
+#ifndef AUTO_GIT_BRANCH
+#define AUTO_GIT_BRANCH ""
+#endif
+
 void WebApiSysstatusClass::init(AsyncWebServer* server)
 {
     using std::placeholders::_1;
@@ -67,6 +71,7 @@ void WebApiSysstatusClass::onSystemStatus(AsyncWebServerRequest* request)
     snprintf(version, sizeof(version), "%d.%d.%d", CONFIG_VERSION >> 24 & 0xff, CONFIG_VERSION >> 16 & 0xff, CONFIG_VERSION >> 8 & 0xff);
     root["config_version"] = version;
     root["git_hash"] = AUTO_GIT_HASH;
+    root["git_branch"] = AUTO_GIT_BRANCH;
     root["pioenv"] = PIOENV;
 
     root["uptime"] = esp_timer_get_time() / 1000000;

webapp/src/components/FirmwareInfo.vue

@@ -22,6 +22,10 @@
                                 {{ systemStatus.git_hash }}
                             </a></td>
                     </tr>
+                    <tr>
+                        <th>{{ $t('firmwareinfo.FirmwareBranch') }}</th>
+                        <td>{{ systemStatus.git_branch }}</td>
+                    </tr>
                     <tr>
                         <th>{{ $t('firmwareinfo.PioEnv') }}</th>
                         <td>{{ systemStatus.pioenv }}</td>

webapp/src/locales/en.json

@@ -202,6 +202,7 @@
         "SdkVersion": "SDK Version",
         "ConfigVersion": "Config Version",
         "FirmwareVersion": "Firmware Version / Git Hash",
+        "FirmwareBranch": "Firmware Branch",
         "PioEnv": "PIO Environment",
         "FirmwareVersionHint": "Click here to show information about your current version",
         "FirmwareUpdate": "Firmware Update",

webapp/src/types/SystemStatus.ts

@@ -10,6 +10,7 @@ export interface SystemStatus {
     config_version: string;
     git_hash: string;
     git_is_hash: boolean;
+    git_branch: string;
     pioenv: string;
     resetreason_0: string;
     resetreason_1: string;

webapp/src/views/SystemInfoView.vue

@@ -61,7 +61,7 @@ export default defineComponent({
             }
 
             const fetchUrl = "https://api.github.com/repos/helgeerbe/OpenDTU-OnBattery/compare/"
-                + this.systemDataList.git_hash + "...HEAD";
+                + this.systemDataList.git_hash + "..." + this.systemDataList.git_branch;
 
             fetch(fetchUrl)
                 .then((response) => {