Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r6233e005c77ee0aa10e80c02254a21f2042b840b -r2bc6542cebc264eb343f791f75223a1ca151465e --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 6233e005c77ee0aa10e80c02254a21f2042b840b) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 2bc6542cebc264eb343f791f75223a1ca151465e) @@ -75,20 +75,29 @@ ID_DGCheckIn = 0x0600, ID_KeepAlive = 0x0700, + // POST + ID_HDPostSingleResultData = 0x8E00, // 142 + ID_HDPostFinalResultData = 0x8F00, // 143 + ID_DGPostSingleResultData = 0x9000, // 144 + ID_DGPostFinalResultData = 0x9100, // 145 + ID_UIPostFinalResultData = 0x9200, // 146 + // ----- Settings // Version - ID_AdjustVersionsReq = 0x1C00, // 28 + ID_AdjustVersionsUIReq = 0x1C00, // 28 + ID_AdjustVersionsUIRsp = 0x9F00, // 159 // ID_UIVersionsTxr - UI Version response transmit + ID_AdjustVersionsHDReq = 0x9E00, // 158 // ID_HDVersionsRxq - HD Version request received ID_AdjustVersionsHDRsp = 0x1D00, // 29 ID_AdjustVersionsDGRsp = 0x1E00, // 30 ID_AdjustSerialHDRsp = 0x9900, // 153 ID_AdjustSerialDGRsp = 0x8800, // 136 + // Service Information ID_AdjustServiceReq = 0x8900, // 137 ID_AdjustServiceHDRsp = 0x8A00, // 138 ID_AdjustServiceDGRsp = 0x8C00, // 140 - // RTC ID_AdjustHDDateTimeReq = 0x6D00, // 109 ID_AdjustHDDateTimeRsp = 0x6E00, // 110 @@ -116,7 +125,6 @@ ID_Rinseback = 0x5600, // 86 ID_Recirculate = 0x5A00, // 90 ID_BloodPrime = 0x5900, // 89 - ID_HDAccelerometerData = 0x3300, // 51 // Alarm Messages ID_AlarmStatus = 0x0200, @@ -181,6 +189,11 @@ ID_DGTemperaturesData = 0x2D00, // 45 ID_DGAccelerometerData = 0x3400, // 52 + // HD Data Messages + ID_HDAccelerometerData = 0x3300, // 51 + ID_HDSyringePumpData = 0x6900, // 105 + + // In-Treatment Adjustables ID_AdjustDurationReq = 0x1600, // 22 ID_AdjustDurationRsp = 0x1B00, // 27 @@ -274,6 +287,7 @@ Q_ENUM(Request_Reject_Reasons) #include "HDDefs.h" + Q_ENUM(HD_POST_States) Q_ENUM(HD_Op_Modes) Q_ENUM(HD_Standby_States) // Treatment @@ -315,10 +329,11 @@ // Pre-Treatment Recirculate Q_ENUM(HD_Pre_Treatment_Recirc_States) // Disinfection - Q_ENUM(DG_Disinfect_States) #include "DGDefs.h" + Q_ENUM(DG_POST_States) Q_ENUM(DG_Op_Modes) + Q_ENUM(DG_Disinfect_States) Q_ENUM(DG_Flush_UI_States) Q_ENUM(DG_Heat_UI_States) Q_ENUM(DG_Chem_UI_States) @@ -335,6 +350,9 @@ typedef GuiActions::Alarm_Data_Types GuiAlarmDataTypes; typedef GuiActions::Request_Reject_Reasons GuiRequestReasons; + // POST + typedef GuiActions::HD_POST_States GuiHDPOSTStates; + typedef GuiActions::DG_POST_States GuiDGPOSTStates; // operation mode typedef GuiActions::HD_Op_Modes GuiHDOpModes; typedef GuiActions::DG_Op_Modes GuiDGOpModes;