Index: AlarmMapping.csv =================================================================== diff -u -r8b3412f64e23b66afa795a95ebc85107358e8070 -r52b9edb89c70c90d29ad4f6b3cd13b5cec3ce775 --- AlarmMapping.csv (.../AlarmMapping.csv) (revision 8b3412f64e23b66afa795a95ebc85107358e8070) +++ AlarmMapping.csv (.../AlarmMapping.csv) (revision 52b9edb89c70c90d29ad4f6b3cd13b5cec3ce775) @@ -182,7 +182,7 @@ 181,"DG load cells weight out of range for tare." 182,"DG load cells invalid calibration." 183,"DG invalid load cell value." - 184,"Inlet or Outlet UV reactor not healthy." + 184,"DG inlet UV reactor not healthy." 185,"DG fan RPM out of range." 186,"DG concentrate pump fault." 187,"DG concentrate pump CP1 speed control error." @@ -319,4 +319,5 @@ 318,"HD Air Pump timeout alarm." 319,"DG chemical disinfect flush flush sample." 320,"DG chemical disinfect flush sample timeout." - 321,"Total number of alarms." + 321,"DG outlet UV reactor not healthy." + 322,"Total number of alarms." Index: cppcheck.err =================================================================== diff -u -r8b3412f64e23b66afa795a95ebc85107358e8070 -r52b9edb89c70c90d29ad4f6b3cd13b5cec3ce775 --- cppcheck.err (.../cppcheck.err) (revision 8b3412f64e23b66afa795a95ebc85107358e8070) +++ cppcheck.err (.../cppcheck.err) (revision 52b9edb89c70c90d29ad4f6b3cd13b5cec3ce775) @@ -1,4 +1,4 @@ -02/02/2023 14:55 +02/06/2023 15:30 Behrouz NematiPour sources/storage/Logger.h:91:5: error: There is an unknown macro here somewhere. Configuration is required. If Q_ENUM is a macro then please configure it. [unknownMacro] Q_ENUM(LogType) Index: cppcheck.log =================================================================== diff -u -r8b3412f64e23b66afa795a95ebc85107358e8070 -r52b9edb89c70c90d29ad4f6b3cd13b5cec3ce775 --- cppcheck.log (.../cppcheck.log) (revision 8b3412f64e23b66afa795a95ebc85107358e8070) +++ cppcheck.log (.../cppcheck.log) (revision 52b9edb89c70c90d29ad4f6b3cd13b5cec3ce775) @@ -1,4 +1,4 @@ -02/02/2023 14:55 +02/06/2023 15:30 Behrouz NematiPour Checking main.cpp ... Defines: @@ -450,7 +450,7 @@ Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native -74/214 files checked 37% done +74/214 files checked 36% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp ... Defines: Undefines: @@ -1108,7 +1108,7 @@ Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native -183/214 files checked 70% done +183/214 files checked 71% done Checking sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp ... Defines: Undefines: Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r52b9edb89c70c90d29ad4f6b3cd13b5cec3ce775 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 52b9edb89c70c90d29ad4f6b3cd13b5cec3ce775) @@ -685,7 +685,7 @@ bool MessageInterpreter::logUnhandledMessage(const Message &vMessage) const { bool ok = false; quint16 id = vMessage.actionId; - QString logString; + QString logString = QString("%1,").arg(id,4,16); if (_messageList.contains(id)) { ok = true; QStringList items = _messageList[id]; @@ -695,10 +695,10 @@ if (i == 0) { QString ID; switch (identifySource(vMessage.can_id, &ID)) { - case Can_Source::eCan_HD: logString = ID + ",~" + item; break; - case Can_Source::eCan_DG: logString = ID + ",~" + item; break; - case Can_Source::eCan_DI: logString = ID + ",~" + item; break; - default : logString = ID + ",~" + item; break; + case Can_Source::eCan_HD: logString += ID + ",~" + item; break; + case Can_Source::eCan_DG: logString += ID + ",~" + item; break; + case Can_Source::eCan_DI: logString += ID + ",~" + item; break; + default : logString += ID + ",~" + item; break; } } else { Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r3c98ac3b121fb977785b78a702c39453d8966f53 -r52b9edb89c70c90d29ad4f6b3cd13b5cec3ce775 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 3c98ac3b121fb977785b78a702c39453d8966f53) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 52b9edb89c70c90d29ad4f6b3cd13b5cec3ce775) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 02-Feb-2023 + * \date (last) 06-Feb-2023 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -217,7 +217,7 @@ /*0181*/case GuiAlarmID::ALARM_ID_DG_LOAD_CELLS_TARE_WEIGHT_OUT_OF_RANGE : { result = QObject::tr("DG load cells weight out of range for tare." ); break; } /* 181*/ /*0182*/case GuiAlarmID::ALARM_ID_DG_LOAD_CELLS_INVALID_CAL_RECORD : { result = QObject::tr("DG load cells invalid calibration." ); break; } /* 182*/ /*0183*/case GuiAlarmID::ALARM_ID_DG_INVALID_LOAD_CELL_VALUE : { result = QObject::tr("DG invalid load cell value." ); break; } /* 183*/ -/*0184*/case GuiAlarmID::ALARM_ID_UV_REACTOR_NOT_HEALTHY : { result = QObject::tr("Inlet or Outlet UV reactor not healthy." ); break; } /* 184*/ +/*0184*/case GuiAlarmID::ALARM_ID_DG_INLET_UV_REACTOR_NOT_HEALTHY : { result = QObject::tr("DG inlet UV reactor not healthy." ); break; } /* 184*/ /*0185*/case GuiAlarmID::ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE : { result = QObject::tr("DG fan RPM out of range." ); break; } /* 185*/ /*0186*/case GuiAlarmID::ALARM_ID_DG_CONCENTRATE_PUMP_FAULT : { result = QObject::tr("DG concentrate pump fault." ); break; } /* 186*/ /*0187*/case GuiAlarmID::ALARM_ID_CP1_SPEED_CONTROL_ERROR : { result = QObject::tr("DG concentrate pump CP1 speed control error." ); break; } /* 187*/ @@ -354,7 +354,8 @@ /*0318*/case GuiAlarmID::ALARM_ID_HD_AIR_PUMP_TIMEOUT : { result = QObject::tr("HD Air Pump timeout alarm." ); break; } /* 318*/ /*0319*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_FLUSH_FLUSH_SAMPLE : { result = QObject::tr("DG chemical disinfect flush flush sample." ); break; } /* 319*/ /*0320*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_FLUSH_SAMPLE_TIMEOUT : { result = QObject::tr("DG chemical disinfect flush sample timeout." ); break; } /* 320*/ -/*0321*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Total number of alarms." ); break; } /* 321*/ +/*0321*/case GuiAlarmID::ALARM_ID_DG_OUTLET_UV_REACTOR_NOT_HEALTHY : { result = QObject::tr("DG outlet UV reactor not healthy." ); break; } /* 321*/ +/*0322*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Total number of alarms." ); break; } /* 322*/ default: result = QObject::tr("ALARM_ID_UNDEFINED [%1]").arg(int(vAlarmID)); Index: sources/storage/Logger.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r52b9edb89c70c90d29ad4f6b3cd13b5cec3ce775 --- sources/storage/Logger.h (.../Logger.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/storage/Logger.h (.../Logger.h) (revision 52b9edb89c70c90d29ad4f6b3cd13b5cec3ce775) @@ -36,7 +36,7 @@ #define LOG_APPED(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogAppED, true ) #define LOG_DEBUG(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogDebug, true ) -#define LOG_APPED_UI(vCONTENT) emit Storage::Logger::I().didLog("UI," + vCONTENT, Storage::Logger::LogType::eLogAppED, true ) +#define LOG_APPED_UI(vCONTENT) emit Storage::Logger::I().didLog(",UI," + vCONTENT, Storage::Logger::LogType::eLogAppED, true ) // forward declarations class tst_logging; @@ -94,7 +94,7 @@ bool _logStorageReady = true; - const char *_headerA = "TimeStamp,SubSys,Name,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40"; + const char *_headerA = "TimeStamp,ID,SubSys,Name,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40"; const char *_headerD = "TimeStamp,Description"; QDir _dir; QString _logFileNamePrefix;