patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature: Add used PIO environment to the system info page

Browse Source
This commit is contained in:
Thomas Basler 2023-05-08 21:43:50 +02:00
parent 99ab78d544
commit efcbd81927
7 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platformio.ini
View File

@ -19,6 +19,7 @@ platform = espressif32@6.1.0
build_flags = build_flags =
-DCOMPONENT_EMBED_FILES=webapp_dist/index.html.gz:webapp_dist/zones.json.gz:webapp_dist/favicon.ico:webapp_dist/js/app.js.gz -DCOMPONENT_EMBED_FILES=webapp_dist/index.html.gz:webapp_dist/zones.json.gz:webapp_dist/favicon.ico:webapp_dist/js/app.js.gz
-DPIOENV=\"$PIOENV\"
-Wall -Wextra -Werror -Wall -Wextra -Werror
-std=c++17 -std=c++17
-std=gnu++17 -std=gnu++17

1
src/WebApi_sysstatus.cpp
View File

@ -67,6 +67,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); snprintf(version, sizeof(version), "%d.%d.%d", CONFIG_VERSION >> 24 & 0xff, CONFIG_VERSION >> 16 & 0xff, CONFIG_VERSION >> 8 & 0xff);
root["config_version"] = version; root["config_version"] = version;
root["git_hash"] = AUTO_GIT_HASH; root["git_hash"] = AUTO_GIT_HASH;
root["pioenv"] = PIOENV;
root["uptime"] = esp_timer_get_time() / 1000000; root["uptime"] = esp_timer_get_time() / 1000000;

4
webapp/src/components/FirmwareInfo.vue
View File

@ -22,6 +22,10 @@
{{ systemStatus.git_hash }} {{ systemStatus.git_hash }}
</a></td> </a></td>
</tr> </tr>
<tr>
<th>{{ $t('firmwareinfo.PioEnv') }}</th>
<td>{{ systemStatus.pioenv }}</td>
</tr>
<tr> <tr>
<th>{{ $t('firmwareinfo.FirmwareUpdate') }}</th> <th>{{ $t('firmwareinfo.FirmwareUpdate') }}</th>
<td><a :href="systemStatus.update_url" target="_blank" v-tooltip <td><a :href="systemStatus.update_url" target="_blank" v-tooltip

1
webapp/src/locales/de.json
View File

@ -159,6 +159,7 @@
"SdkVersion": "SDK-Version", "SdkVersion": "SDK-Version",
"ConfigVersion": "Konfigurationsversion", "ConfigVersion": "Konfigurationsversion",
"FirmwareVersion": "Firmwareversion / git Hash", "FirmwareVersion": "Firmwareversion / git Hash",
"PioEnv": "PIO Umgebung",
"FirmwareVersionHint": "Klicken Sie hier, um Informationen über Ihre aktuelle Version anzuzeigen", "FirmwareVersionHint": "Klicken Sie hier, um Informationen über Ihre aktuelle Version anzuzeigen",
"FirmwareUpdate": "Firmware-Aktualisierung", "FirmwareUpdate": "Firmware-Aktualisierung",
"FirmwareUpdateHint": "Klicken Sie hier, um die Änderungen zwischen Ihrer Version und der neuesten Version anzuzeigen", "FirmwareUpdateHint": "Klicken Sie hier, um die Änderungen zwischen Ihrer Version und der neuesten Version anzuzeigen",

1
webapp/src/locales/en.json
View File

@ -159,6 +159,7 @@
"SdkVersion": "SDK Version", "SdkVersion": "SDK Version",
"ConfigVersion": "Config Version", "ConfigVersion": "Config Version",
"FirmwareVersion": "Firmware Version / Git Hash", "FirmwareVersion": "Firmware Version / Git Hash",
"PioEnv": "PIO Environment",
"FirmwareVersionHint": "Click here to show information about your current version", "FirmwareVersionHint": "Click here to show information about your current version",
"FirmwareUpdate": "Firmware Update", "FirmwareUpdate": "Firmware Update",
"FirmwareUpdateHint": "Click here to view the changes between your version and the latest version", "FirmwareUpdateHint": "Click here to view the changes between your version and the latest version",

1
webapp/src/locales/fr.json
View File

@ -159,6 +159,7 @@
"SdkVersion": "Version du SDK", "SdkVersion": "Version du SDK",
"ConfigVersion": "Version de la configuration", "ConfigVersion": "Version de la configuration",
"FirmwareVersion": "Version du firmware / Hash Git", "FirmwareVersion": "Version du firmware / Hash Git",
"PioEnv": "PIO Environment",
"FirmwareVersionHint": "Cliquez ici pour afficher des informations sur votre version actuelle", "FirmwareVersionHint": "Cliquez ici pour afficher des informations sur votre version actuelle",
"FirmwareUpdate": "Mise à jour du firmware", "FirmwareUpdate": "Mise à jour du firmware",
"FirmwareUpdateHint": "Cliquez ici pour voir les changements entre votre version et la dernière version", "FirmwareUpdateHint": "Cliquez ici pour voir les changements entre votre version et la dernière version",

1
webapp/src/types/SystemStatus.ts
View File

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