diff --git a/lang/el.lang.json b/lang/el.lang.json index 7f445719..22b7e256 100644 --- a/lang/el.lang.json +++ b/lang/el.lang.json @@ -225,6 +225,7 @@ "SdkVersion": "Έκδοση SDK", "ConfigVersion": "Έκδοση διαμόρφωσης", "FirmwareVersion": "Έκδοση υλικολογισμικού / Git Hash", + "FirmwareBranch": "Firmware Branch", "PioEnv": "Περιβάλλον PIO", "FirmwareVersionHint": "Κάντε κλικ εδώ για να εμφανίσετε πληροφορίες σχετικά με την τρέχουσα έκδοση", "FirmwareUpdate": "Ενημέρωση υλικολογισμικού", diff --git a/lang/es.lang.json b/lang/es.lang.json index b0bb6f3c..2e59c823 100644 --- a/lang/es.lang.json +++ b/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", diff --git a/lang/it.lang.json b/lang/it.lang.json index 60bfb785..3b69e748 100644 --- a/lang/it.lang.json +++ b/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", diff --git a/lang/pl.lang.json b/lang/pl.lang.json index 4b81e823..50cb5c83 100644 --- a/lang/pl.lang.json +++ b/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", diff --git a/src/WebApi_sysstatus.cpp b/src/WebApi_sysstatus.cpp index 8c843895..53e46ee5 100644 --- a/src/WebApi_sysstatus.cpp +++ b/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; diff --git a/webapp/src/components/FirmwareInfo.vue b/webapp/src/components/FirmwareInfo.vue index 033fe73f..a9b3d22a 100644 --- a/webapp/src/components/FirmwareInfo.vue +++ b/webapp/src/components/FirmwareInfo.vue @@ -28,6 +28,10 @@ + + {{ $t('firmwareinfo.FirmwareBranch') }} + {{ systemStatus.git_branch }} + {{ $t('firmwareinfo.PioEnv') }} {{ systemStatus.pioenv }} diff --git a/webapp/src/locales/de.json b/webapp/src/locales/de.json index 01d9bb5c..c2d92ab3 100644 --- a/webapp/src/locales/de.json +++ b/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", diff --git a/webapp/src/locales/en.json b/webapp/src/locales/en.json index c64c2d95..8bbd3c8a 100644 --- a/webapp/src/locales/en.json +++ b/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", diff --git a/webapp/src/locales/fr.json b/webapp/src/locales/fr.json index 33989698..eb7349ef 100644 --- a/webapp/src/locales/fr.json +++ b/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", diff --git a/webapp/src/types/SystemStatus.ts b/webapp/src/types/SystemStatus.ts index 88ecacb4..41fdd3cf 100644 --- a/webapp/src/types/SystemStatus.ts +++ b/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; diff --git a/webapp/src/views/SystemInfoView.vue b/webapp/src/views/SystemInfoView.vue index b3faf691..28bea575 100644 --- a/webapp/src/views/SystemInfoView.vue +++ b/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) => {