Index: sources/gui/GuiGlobals.h =================================================================== diff -u -re125bd5cf13750eaf241d518b9c846139afaa81c -rb3eb8bc9696c4db9867ad1cf13b47c455a94e0fe --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision e125bd5cf13750eaf241d518b9c846139afaa81c) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision b3eb8bc9696c4db9867ad1cf13b47c455a94e0fe) @@ -118,6 +118,8 @@ ID_AlarmClearedConditionRsp = 0x3F00, // 63 // the same code is used for every unit to send and receive over the CANBus ID_AlarmSilenceReq = 0x3200, // 50 ID_AlarmUserActionReq = 0x4000, // 64 // there is no response since it is kind of the response to the ID_AlarmStatus from UI to HD + ID_AlarmActiveListReq = 0x9700, // 151 + ID_AlarmActiveListRsp = 0x9800, // 152 // Pre-Treatment // Pre-Treatment Initiate Treatment @@ -216,9 +218,13 @@ ID_AdjustDisposablesRemovalConfirmReq = 0x7300, // 115 ID_AdjustDisposableRemovalConfirmRsp = 0x7400, // 116 - // Treatment Log + // Treatment Log Adjs ID_AdjustTreatmentLogReq = 0x7500, // 117 ID_AdjustTreatmentLogRsp = 0x7600, // 118 + // Treatment Log Data + ID_TreatmentLogAvrgeData = 0x9400, // 148 + ID_TreatmentLogAlarmData = 0x9500, // 149 + ID_TreatmentLogEventData = 0x9600, // 150 // Disinfect ID_AdjustDisinfectReq = 0x7F00, // 127 @@ -252,6 +258,7 @@ Q_ENUM(Alarm_List ) Q_ENUM(Alarm_State_Flag_Bit_Positions) Q_ENUM(Alarm_User_Actions) + Q_ENUM(Alarm_Data_Types) #include "MsgDefs.h" Q_ENUM(Request_Reject_Reasons) @@ -302,7 +309,7 @@ Q_ENUM(DG_Op_Modes) Q_ENUM(DG_Heat_States) - // TODO: temporary enum until DG defines one + // TODO : temporary enum until DG defines one enum DG_Disinfect_States { DG_DISINFECT_STATE_UNKNOWN = -1, DG_DISINFECT_STATE_FLUSH = 0, @@ -320,6 +327,7 @@ typedef GuiActions::Alarm_List GuiAlarmID; typedef GuiActions::Alarm_State_Flag_Bit_Positions GuiAlarmFlags; typedef GuiActions::Alarm_User_Actions GuiAlarmUserActions; + typedef GuiActions::Alarm_Data_Types GuiAlarmDataTypes; typedef GuiActions::Request_Reject_Reasons GuiRequestReasons; // operation mode