souko/Kettenoeler
souko/Kettenoeler
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

made FW-Version same Format as FS.Version

Browse Source
This commit is contained in:
Marcel Peterkau 2022-08-28 23:27:01 +02:00
parent b9f658b111
commit f9498dac7d
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Software/src/common.h
View File

@ -26,8 +26,7 @@
#define HOST_NAME "ChainLube_%06X" // Use printf-Formatting - Chip-ID (uin32_t) will be added #define HOST_NAME "ChainLube_%06X" // Use printf-Formatting - Chip-ID (uin32_t) will be added
#endif #endif
#define SW_VERSION_MAJOR 1 #define SW_VERSION 1.2
#define SW_VERSION_MINOR 1
#define FLASH_FS_VERSION 1.2 #define FLASH_FS_VERSION 1.2

2
Software/src/main.cpp
View File

@ -327,7 +327,7 @@ void RemotDebug_printSystemInfo()
: "UNKNOWN")); : "UNKNOWN"));
debugA("OTA-Pass: %s", QUOTE(ADMIN_PASSWORD)); debugA("OTA-Pass: %s", QUOTE(ADMIN_PASSWORD));
debugA("Git-Revison: %s", GIT_REV); 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() void RemoteDebug_dumpConfig()

4
Software/src/webui.cpp
View File

@ -210,9 +210,7 @@ String processor(const String &var)
return String(globals.systemStatustxt); return String(globals.systemStatustxt);
if (var == "SW_VERSION") if (var == "SW_VERSION")
{ {
char buffer[7]; return String(QUOTE(SW_VERSION));
sprintf(buffer, "%d.%02d", SW_VERSION_MAJOR, SW_VERSION_MINOR);
return String(buffer);
} }
if (var == "FS_VERSION") if (var == "FS_VERSION")
return String(globals.FlashVersion); return String(globals.FlashVersion);