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

Rename firmware_version to config_version

Browse Source
This commit is contained in:
Thomas Basler 2022-10-05 18:23:04 +02:00
parent d021d7529f
commit 7ff0f111af
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/WebApi_sysstatus.cpp
View File

@ -59,7 +59,7 @@ void WebApiSysstatusClass::onSystemStatus(AsyncWebServerRequest* request)
char version[16]; char version[16];
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[F("firmware_version")] = version; root[F("config_version")] = version;
root[F("git_hash")] = AUTO_GIT_HASH; root[F("git_hash")] = AUTO_GIT_HASH;
root[F("uptime")] = esp_timer_get_time() / 1000000; root[F("uptime")] = esp_timer_get_time() / 1000000;

2
webapp/src/components/SystemInfoView.vue
View File

@ -45,7 +45,7 @@ export default defineComponent({
// FirmwareInfo // FirmwareInfo
hostname: "", hostname: "",
sdkversion: "", sdkversion: "",
firmware_version: "", config_version: "",
git_hash: "", git_hash: "",
resetreason_0: "", resetreason_0: "",
resetreason_1: "", resetreason_1: "",

8
webapp/src/components/partials/FirmwareInfo.vue
View File

@ -16,11 +16,11 @@
<td>{{ sdkversion }}</td> <td>{{ sdkversion }}</td>
</tr> </tr>
<tr> <tr>
<th>Firmware Version</th> <th>Config Version</th>
<td>{{ firmware_version }}</td> <td>{{ config_version }}</td>
</tr> </tr>
<tr> <tr>
<th>Git Hash</th> <th>Firmware Version / Git Hash</th>
<td><a :href="'https://github.com/tbnobody/OpenDTU/commits/' + git_hash?.substring(1)" target="_blank">{{ git_hash?.substring(1) }}</a></td> <td><a :href="'https://github.com/tbnobody/OpenDTU/commits/' + git_hash?.substring(1)" target="_blank">{{ git_hash?.substring(1) }}</a></td>
</tr> </tr>
<tr> <tr>
@ -53,7 +53,7 @@ export default defineComponent({
props: { props: {
hostname: String, hostname: String,
sdkversion: String, sdkversion: String,
firmware_version: String, config_version: String,
git_hash: String, git_hash: String,
resetreason_0: String, resetreason_0: String,
resetreason_1: String, resetreason_1: String,