From 8fdd09f32fd49b474522b1d1ebe408611fec3b0f Mon Sep 17 00:00:00 2001 From: Marcel Peterkau Date: Fri, 3 Mar 2023 10:48:19 +0100 Subject: [PATCH] Version-String Format change --- Software/data_src/version | 2 +- Software/src/globals.h | 6 +++--- Software/src/webui.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Software/data_src/version b/Software/data_src/version index 840ca8c..2ee5615 100644 --- a/Software/data_src/version +++ b/Software/data_src/version @@ -1 +1 @@ -1.4 \ No newline at end of file +1.04 \ No newline at end of file diff --git a/Software/src/globals.h b/Software/src/globals.h index 347ac7d..6161a6e 100644 --- a/Software/src/globals.h +++ b/Software/src/globals.h @@ -47,14 +47,14 @@ typedef struct Constants_s { uint8_t FW_Version_major; uint8_t FW_Version_minor; - uint8_t Flash_Version_major; - uint8_t Flash_Version_minor; + uint8_t Required_Flash_Version_major; + uint8_t Required_Flash_Version_minor; char GitHash[11]; } Constants_t; const Constants_t constants PROGMEM = { 1,4, // Firmware_Version - 1,4, // Flash Version + 1,4, // Required Flash Version GIT_REV // Git-Hash-String }; diff --git a/Software/src/webui.cpp b/Software/src/webui.cpp index 643dc55..9e08d37 100644 --- a/Software/src/webui.cpp +++ b/Software/src/webui.cpp @@ -34,7 +34,7 @@ void initWebUI() GetFlashVersion(globals.FlashVersion, sizeof(globals.FlashVersion)); char buffer[6]; - snprintf(buffer, sizeof(buffer), "%d.%d", constants.FW_Version_major, constants.FW_Version_minor); + snprintf(buffer, sizeof(buffer), "%d.%02d", constants.Required_Flash_Version_major, constants.Required_Flash_Version_minor); if (strcmp(globals.FlashVersion, buffer)) { MaintainDTC(DTC_FLASHFS_VERSION_ERROR, DTC_WARN, true); @@ -246,11 +246,11 @@ String processor(const String &var) if (var == "SYSTEM_STATUS") return String(globals.systemStatustxt); - + if (var == "SW_VERSION") { char buffer[6]; - snprintf(buffer,sizeof(buffer), "%d.%02d", constants.FW_Version_major, constants.FW_Version_minor); + snprintf(buffer, sizeof(buffer), "%d.%02d", constants.FW_Version_major, constants.FW_Version_minor); return String(buffer); }