diff --git a/Software/include/globals.h b/Software/include/globals.h index ace6e03..54f7a5a 100644 --- a/Software/include/globals.h +++ b/Software/include/globals.h @@ -11,6 +11,13 @@ typedef enum eSystem_Status sysStat_Shutdown } tSystem_Status; +const char sSystem_Status_txt[][9] = { + "Startup", + "Normal", + "Error", + "Shutdown" +}; + typedef enum eEERequest { EE_IDLE, @@ -31,8 +38,6 @@ typedef struct Globals_s char DeviceName_ID[43]; char FlashVersion[10]; tSystem_Status systemStatus = sysStat_Startup; - tSystem_Status resumeStatus = sysStat_Startup; - char systemStatustxt[16] = ""; eEERequest requestEEAction = EE_IDLE; uint16_t eePersistanceAdress; bool hasDTC; diff --git a/Software/src/debugger.cpp b/Software/src/debugger.cpp index b83141c..1810495 100644 --- a/Software/src/debugger.cpp +++ b/Software/src/debugger.cpp @@ -204,8 +204,6 @@ void Debug_dumpConfig() void Debug_dumpGlobals() { Debug_pushMessage("systemStatus: %d\n", globals.systemStatus); - Debug_pushMessage("resumeStatus: %d\n", globals.resumeStatus); - Debug_pushMessage("systemStatustxt: %s\n", globals.systemStatustxt); Debug_pushMessage("battery_level: %d\n", globals.battery_level); Debug_pushMessage("loadvoltage_mV: %d\n", globals.loadvoltage_mV); Debug_pushMessage("requestEEAction: %d\n", globals.requestEEAction); diff --git a/Software/src/globals.cpp b/Software/src/globals.cpp index abc312d..1d12150 100644 --- a/Software/src/globals.cpp +++ b/Software/src/globals.cpp @@ -5,6 +5,5 @@ Globals_t globals; void initGlobals() { globals.systemStatus = sysStat_Startup; - globals.resumeStatus = sysStat_Normal; globals.requestEEAction = EE_IDLE; } diff --git a/Software/src/webui.cpp b/Software/src/webui.cpp index a89d8d6..7c55524 100644 --- a/Software/src/webui.cpp +++ b/Software/src/webui.cpp @@ -66,7 +66,7 @@ String processor(const String &var) if (var == "HOSTNAME") return String(globals.DeviceName); if (var == "SYSTEM_STATUS") - return String(globals.systemStatustxt); + return String(sSystem_Status_txt[globals.systemStatus]); if (var == "SW_VERSION") { char buffer[6];