Show git branch name in system info

Thanks to OnBattery

lang/el.lang.json

@@ -225,6 +225,7 @@
             "SdkVersion": "Έκδοση SDK",
             "ConfigVersion": "Έκδοση διαμόρφωσης",
             "FirmwareVersion": "Έκδοση υλικολογισμικού / Git Hash",
+            "FirmwareBranch": "Firmware Branch",
             "PioEnv": "Περιβάλλον PIO",
             "FirmwareVersionHint": "Κάντε κλικ εδώ για να εμφανίσετε πληροφορίες σχετικά με την τρέχουσα έκδοση",
             "FirmwareUpdate": "Ενημέρωση υλικολογισμικού",

lang/es.lang.json

@@ -225,6 +225,7 @@
             "SdkVersion": "Versión del SDK",
             "ConfigVersion": "Versión de la configuración",
             "FirmwareVersion": "Versión del firmware / Hash de Git",
+            "FirmwareBranch": "Firmware Branch",
             "PioEnv": "Entorno PIO",
             "FirmwareVersionHint": "Haga clic aquí para mostrar información sobre su versión actual",
             "FirmwareUpdate": "Actualización de firmware",

lang/it.lang.json

@@ -225,6 +225,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",

lang/pl.lang.json

@@ -225,6 +225,7 @@
             "SdkVersion": "Wersja SDK",
             "ConfigVersion": "Wersja konfiguracji",
             "FirmwareVersion": "Wersja oprogramowania / Git Hash",
+            "FirmwareBranch": "Firmware Branch",
             "PioEnv": "Środowisko PIO",
             "FirmwareVersionHint": "Kliknij tutaj, aby wyświetlić informacje o aktualnej wersji",
             "FirmwareUpdate": "Aktualizacja oprogramowania",

src/WebApi_sysstatus.cpp

@@ -81,6 +81,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"] = __COMPILED_GIT_HASH__;
+    root["git_branch"] = __COMPILED_GIT_BRANCH__;
     root["pioenv"] = PIOENV;
 
     root["uptime"] = esp_timer_get_time() / 1000000;

webapp/src/components/FirmwareInfo.vue

@@ -28,6 +28,10 @@
                             </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/de.json

@@ -210,6 +210,7 @@
         "SdkVersion": "SDK-Version",
         "ConfigVersion": "Konfigurationsversion",
         "FirmwareVersion": "Firmwareversion / git Hash",
+        "FirmwareBranch": "Firmware Branch",
         "PioEnv": "PIO Umgebung",
         "FirmwareVersionHint": "Klicken Sie hier, um Informationen über Ihre aktuelle Version anzuzeigen",
         "FirmwareUpdate": "Firmware-Aktualisierung",

webapp/src/locales/en.json

@@ -210,6 +210,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/locales/fr.json

@@ -210,6 +210,7 @@
         "SdkVersion": "Version du SDK",
         "ConfigVersion": "Version de la configuration",
         "FirmwareVersion": "Version du firmware / Hash Git",
+        "FirmwareBranch": "Firmware Branch",
         "PioEnv": "PIO Environment",
         "FirmwareVersionHint": "Cliquez ici pour afficher des informations sur votre version actuelle",
         "FirmwareUpdate": "Mise à jour du firmware",

webapp/src/types/SystemStatus.ts

@@ -20,6 +20,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

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