From f9498dac7d3cb85d1ca5f35e6af8f74906480a0a Mon Sep 17 00:00:00 2001 From: Marcel Peterkau Date: Sun, 28 Aug 2022 23:27:01 +0200 Subject: [PATCH] made FW-Version same Format as FS.Version --- Software/src/common.h | 3 +-- Software/src/main.cpp | 2 +- Software/src/webui.cpp | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Software/src/common.h b/Software/src/common.h index 35611f4..8f4045e 100644 --- a/Software/src/common.h +++ b/Software/src/common.h @@ -26,8 +26,7 @@ #define HOST_NAME "ChainLube_%06X" // Use printf-Formatting - Chip-ID (uin32_t) will be added #endif -#define SW_VERSION_MAJOR 1 -#define SW_VERSION_MINOR 1 +#define SW_VERSION 1.2 #define FLASH_FS_VERSION 1.2 diff --git a/Software/src/main.cpp b/Software/src/main.cpp index ffb1f5c..5d2ec95 100644 --- a/Software/src/main.cpp +++ b/Software/src/main.cpp @@ -327,7 +327,7 @@ void RemotDebug_printSystemInfo() : "UNKNOWN")); debugA("OTA-Pass: %s", QUOTE(ADMIN_PASSWORD)); debugA("Git-Revison: %s", GIT_REV); - debugA("Sw-Version: %d.%02d", SW_VERSION_MAJOR, SW_VERSION_MINOR); + debugA("Sw-Version: %s", QUOTE(SW_VERSION)); } void RemoteDebug_dumpConfig() diff --git a/Software/src/webui.cpp b/Software/src/webui.cpp index 13b8c9c..9e5e9b9 100644 --- a/Software/src/webui.cpp +++ b/Software/src/webui.cpp @@ -210,9 +210,7 @@ String processor(const String &var) return String(globals.systemStatustxt); if (var == "SW_VERSION") { - char buffer[7]; - sprintf(buffer, "%d.%02d", SW_VERSION_MAJOR, SW_VERSION_MINOR); - return String(buffer); + return String(QUOTE(SW_VERSION)); } if (var == "FS_VERSION") return String(globals.FlashVersion);