Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r6d7a81af8acbaaf3ee3f722ccace021634507cb4 -rbc3fd305cbcfa47b0f535b68a9b022906d9a3797 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 6d7a81af8acbaaf3ee3f722ccace021634507cb4) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision bc3fd305cbcfa47b0f535b68a9b022906d9a3797) @@ -139,9 +139,9 @@ ID_Heparin = 0x8C00, // 140 ID_IsolatedUF = 0x9A00, // 154 ID_Rinseback = 0x8F00, // 143 //// ----- @LEAHIZED - ID_Recirculate = 0x5A00, // 90 + ID_Recirculate = 0xA800, // 168 ID_BloodPrime = 0x9700, // 151 - ID_TreatmentStop = 0x4900, // 73 + ID_TreatmentStop = 0x5B00, // 91 ID_Vitals = 0x6500, // 101 // Alarm Messages @@ -305,8 +305,8 @@ ID_AdjustRinsebackRsp = 0x9100, // 145 //// ----- @LEAHIZED // Recirculate - ID_AdjustRecirculateReq = 0x540F, // 84 //// ----- @CRAPIZED: had to change to avoid duplication - ID_AdjustRecirculateRsp = 0x5500, // 85 + ID_AdjustRecirculateReq = 0xA600, // 166 + ID_AdjustRecirculateRsp = 0xA700, // 167 // Treatment End ID_AdjustTreatmentEndReq = 0x8D00, // 141 @@ -315,20 +315,21 @@ // Post-Treatment // Patient Disconnect ID_AdjustPatientDisconnectNotifyReq = 0x4A00, // 74 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response - ID_AdjustPatientDisconnectConfirmReq = 0x060F, // 060f //// ----- @CRAPIZED - ID_AdjustPatientDisconnectConfirmRsp = 0x7E0F, // 126 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustPatientDisconnectConfirmReq = 0x5500, // 85 + ID_AdjustPatientDisconnectConfirmRsp = 0x5600, // 86 // Disposables Removal ID_AdjustDisposablesRemovalConfirmReq = 0x9400, // 148 ID_AdjustDisposablesRemovalConfirmRsp = 0x9500, // 149 // Treatment Log Adjs - ID_AdjustTreatmentLogReq = 0x750F, // 117 //// ----- @CRAPIZED: had to change to avoid duplication - ID_AdjustTreatmentLogRsp = 0x760F, // 118 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustTreatmentLogReq = 0xA900, // 166 + ID_AdjustTreatmentLogRsp = 0xAA00, // 167 + // Treatment Log Data ID_TreatmentLogAvrgeData = 0x940F, // 148 //// ----- @CRAPIZED: had to change to avoid duplication - ID_TreatmentLogAlarmData = 0x950F, // 149 //// ----- @CRAPIZED: had to change to avoid duplication - ID_TreatmentLogEventData = 0x960F, // 150 //// ----- @CRAPIZED: had to change to avoid duplication + ID_TreatmentLogAlarmData = 0x6A00, // 106 //// ----- @LEAHIZED + ID_TreatmentLogEventData = 0x6B00, // 107 //// ----- @LEAHIZED // Disinfect ID_AdjustDisinfectModeReq = 0x9A0F, // 154 //// ----- @CRAPIZED: had to change to avoid duplication