more Versioninfo for easier identification
This commit is contained in:
parent
34c50df2e9
commit
f87d2aaeca
@ -645,6 +645,10 @@
|
|||||||
<td>Flash Version</td>
|
<td>Flash Version</td>
|
||||||
<td>%FS_VERSION%</td>
|
<td>%FS_VERSION%</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Git Revision</td>
|
||||||
|
<td>%GIT_REV%</td>
|
||||||
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</p>
|
</p>
|
||||||
<!-- Div Group VersionInfo -->
|
<!-- Div Group VersionInfo -->
|
||||||
|
@ -32,9 +32,6 @@
|
|||||||
#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 1.4
|
|
||||||
#define FLASH_FS_VERSION 1.4
|
|
||||||
|
|
||||||
#ifndef OTA_DELAY
|
#ifndef OTA_DELAY
|
||||||
#define OTA_DELAY 50 // ticks -> 10ms / tick
|
#define OTA_DELAY 50 // ticks -> 10ms / tick
|
||||||
#endif
|
#endif
|
||||||
|
@ -140,8 +140,8 @@ void RemotDebug_printSystemInfo()
|
|||||||
: ideMode == FM_DOUT ? "DOUT"
|
: ideMode == FM_DOUT ? "DOUT"
|
||||||
: "UNKNOWN"));
|
: "UNKNOWN"));
|
||||||
Debug_pushMessage("OTA-Pass: %s", QUOTE(ADMIN_PASSWORD));
|
Debug_pushMessage("OTA-Pass: %s", QUOTE(ADMIN_PASSWORD));
|
||||||
Debug_pushMessage("Git-Revison: %s", GIT_REV);
|
Debug_pushMessage("Git-Revison: %s", constants.GitHash);
|
||||||
Debug_pushMessage("Sw-Version: %s", QUOTE(SW_VERSION));
|
Debug_pushMessage("Sw-Version: %d.%02d", constants.FW_Version_major, constants.FW_Version_minor);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Debug_dumpConfig()
|
void Debug_dumpConfig()
|
||||||
|
@ -43,6 +43,21 @@ typedef struct Globals_s
|
|||||||
|
|
||||||
extern Globals_t globals;
|
extern Globals_t globals;
|
||||||
|
|
||||||
|
typedef struct Constants_s
|
||||||
|
{
|
||||||
|
uint8_t FW_Version_major;
|
||||||
|
uint8_t FW_Version_minor;
|
||||||
|
uint8_t Flash_Version_major;
|
||||||
|
uint8_t Flash_Version_minor;
|
||||||
|
char GitHash[11];
|
||||||
|
} Constants_t;
|
||||||
|
|
||||||
|
const Constants_t constants PROGMEM = {
|
||||||
|
1,4, // Firmware_Version
|
||||||
|
1,4, // Flash Version
|
||||||
|
GIT_REV // Git-Hash-String
|
||||||
|
};
|
||||||
|
|
||||||
void initGlobals();
|
void initGlobals();
|
||||||
|
|
||||||
#endif
|
#endif
|
@ -33,7 +33,9 @@ void initWebUI()
|
|||||||
|
|
||||||
GetFlashVersion(globals.FlashVersion, sizeof(globals.FlashVersion));
|
GetFlashVersion(globals.FlashVersion, sizeof(globals.FlashVersion));
|
||||||
|
|
||||||
if (strcmp(globals.FlashVersion, QUOTE(FLASH_FS_VERSION)))
|
char buffer[6];
|
||||||
|
snprintf(buffer, sizeof(buffer), "%d.%d", constants.FW_Version_major, constants.FW_Version_minor);
|
||||||
|
if (strcmp(globals.FlashVersion, buffer))
|
||||||
{
|
{
|
||||||
MaintainDTC(DTC_FLASHFS_VERSION_ERROR, DTC_WARN, true);
|
MaintainDTC(DTC_FLASHFS_VERSION_ERROR, DTC_WARN, true);
|
||||||
}
|
}
|
||||||
@ -244,13 +246,20 @@ String processor(const String &var)
|
|||||||
|
|
||||||
if (var == "SYSTEM_STATUS")
|
if (var == "SYSTEM_STATUS")
|
||||||
return String(globals.systemStatustxt);
|
return String(globals.systemStatustxt);
|
||||||
|
|
||||||
if (var == "SW_VERSION")
|
if (var == "SW_VERSION")
|
||||||
{
|
{
|
||||||
return String(QUOTE(SW_VERSION));
|
char buffer[6];
|
||||||
|
snprintf(buffer,sizeof(buffer), "%d.%02d", constants.FW_Version_major, constants.FW_Version_minor);
|
||||||
|
return String(buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (var == "FS_VERSION")
|
if (var == "FS_VERSION")
|
||||||
return String(globals.FlashVersion);
|
return String(globals.FlashVersion);
|
||||||
|
|
||||||
|
if (var == "GIT_REV")
|
||||||
|
return String(constants.GitHash);
|
||||||
|
|
||||||
if (var == "PLACEHOLDER")
|
if (var == "PLACEHOLDER")
|
||||||
return "placeholder";
|
return "placeholder";
|
||||||
|
|
||||||
@ -499,8 +508,10 @@ void WebServerEEJSON_Callback(AsyncWebServerRequest *request)
|
|||||||
char buffer[16];
|
char buffer[16];
|
||||||
|
|
||||||
fwinfo["DeviceName"] = globals.DeviceName;
|
fwinfo["DeviceName"] = globals.DeviceName;
|
||||||
fwinfo["FW-Version"] = QUOTE(SW_VERSION);
|
sprintf(buffer, "%d.%02d", constants.Flash_Version_major, constants.Flash_Version_minor);
|
||||||
|
fwinfo["FW-Version"] = buffer;
|
||||||
fwinfo["FS-Version"] = globals.FlashVersion;
|
fwinfo["FS-Version"] = globals.FlashVersion;
|
||||||
|
fwinfo["Git-Hash"] = constants.GitHash;
|
||||||
|
|
||||||
JsonObject config = json.createNestedObject("config");
|
JsonObject config = json.createNestedObject("config");
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user