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

Version-String Format change

Browse Source
This commit is contained in:
Marcel Peterkau 2023-03-03 10:48:19 +01:00
parent f87d2aaeca
commit 8fdd09f32f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Software/data_src/version
View File

@ -1 +1 @@
1.4 1.04

6
Software/src/globals.h
View File

@ -47,14 +47,14 @@ typedef struct Constants_s
{ {
uint8_t FW_Version_major; uint8_t FW_Version_major;
uint8_t FW_Version_minor; uint8_t FW_Version_minor;
uint8_t Flash_Version_major; uint8_t Required_Flash_Version_major;
uint8_t Flash_Version_minor; uint8_t Required_Flash_Version_minor;
char GitHash[11]; char GitHash[11];
} Constants_t; } Constants_t;
const Constants_t constants PROGMEM = { const Constants_t constants PROGMEM = {
1,4, // Firmware_Version 1,4, // Firmware_Version
1,4, // Flash Version 1,4, // Required Flash Version
GIT_REV // Git-Hash-String GIT_REV // Git-Hash-String
}; };

4
Software/src/webui.cpp
View File

@ -34,7 +34,7 @@ void initWebUI()
GetFlashVersion(globals.FlashVersion, sizeof(globals.FlashVersion)); GetFlashVersion(globals.FlashVersion, sizeof(globals.FlashVersion));
char buffer[6]; 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)) if (strcmp(globals.FlashVersion, buffer))
{ {
MaintainDTC(DTC_FLASHFS_VERSION_ERROR, DTC_WARN, true); MaintainDTC(DTC_FLASHFS_VERSION_ERROR, DTC_WARN, true);
@ -250,7 +250,7 @@ String processor(const String &var)
if (var == "SW_VERSION") if (var == "SW_VERSION")
{ {
char buffer[6]; 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); return String(buffer);
} }