Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r32a7b4d52315019d125c6c7b728bf0d215919c0f -rd9993ef9458e1c25abc86a63d4d10b666ff8cd2c --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 32a7b4d52315019d125c6c7b728bf0d215919c0f) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision d9993ef9458e1c25abc86a63d4d10b666ff8cd2c) @@ -83,9 +83,9 @@ // POST ID_HDPostSingleResultData = 0x8E0F, // 142 //// ----- @CRAPIZED: had to change to avoid duplication - ID_HDPostFinalResultData = 0x8F0F, // 143 //// ----- @CRAPIZED - ID_DGPostSingleResultData = 0x9000, // 144 - ID_DGPostFinalResultData = 0x9100, // 145 + ID_HDPostFinalResultData = 0x8F0F, // 143 //// ----- @CRAPIZED: had to change to avoid duplication + ID_DGPostSingleResultData = 0x900F, // 144 //// ----- @CRAPIZED: had to change to avoid duplication + ID_DGPostFinalResultData = 0x910F, // 145 //// ----- @CRAPIZED: had to change to avoid duplication ID_UIPostFinalResultData = 0x920F, // 146 //// ----- @CRAPIZED: had to change to avoid duplication ID_UIPostFinalResultHDReq = 0xB200, // 178 // ID_HDFinalResultRxq - HD Final Result request received @@ -110,7 +110,7 @@ ID_AdjustServiceDatesDGRsp = 0x8C0F, // 140 //// ----- @CRAPIZED: had to change to avoid duplication // HD/DG Usage Counter - ID_HDUsageInfoReq = 0xA000, // 160 + ID_HDUsageInfoReq = 0xA00F, // 160 //// ----- @CRAPIZED: had to change to avoid duplication ID_HDUsageInfoRsp = 0x8B0F, // 139 //// ----- @CRAPIZED: had to change to avoid duplication // RTC @@ -137,9 +137,10 @@ ID_Saline = 0x3D00, // 61 //// ----- @LEAHIZED ID_Ultrafiltration = 0x3E00, // 62 //// ----- @LEAHIZED ID_Heparin = 0x8C00, // 140 + ID_IsolatedUF = 0x9A00, // 154 ID_Rinseback = 0x8F00, // 143 //// ----- @LEAHIZED ID_Recirculate = 0x5A00, // 90 - ID_BloodPrime = 0x5900, // 89 + ID_BloodPrime = 0x9700, // 151 ID_TreatmentStop = 0x4900, // 73 ID_Vitals = 0x6500, // 101 @@ -190,9 +191,9 @@ ID_AdjustPatientConnectionConfirmReq = 0x660F, // 102 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustPatientConnectionConfirmRsp = 0x670F, // 103 //// ----- @CRAPIZED: had to change to avoid duplication // Pre-Treatment Start Treatment - ID_AdjustStartTreatmentReq = 0x7100, // 113 - ID_AdjustStartTreatmentRsp = 0x720F, // 114 //// ----- @CRAPIZED: had to change to avoid duplication - + ID_AdjustStartTreatmentReq = 0xA100, // 161 + ID_AdjustStartTreatmentRsp = 0xA200, // 162 + // DG Data Messages ID_DGROPumpData = 0x1F0F, // 31 //// ----- @CRAPIZED: had to change to avoid duplication ID_DGDrainPumpData = 0x240F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication @@ -236,6 +237,10 @@ ID_TDTemperatureData = 0x5300, // 83 //// ----- TODO: Payload subject to change given FW implementation ID_TreatmentParametersSetPointData = 0x4F00, // 79 //// ----- @LEAHIZED + // Blood Prime + ID_AdjustBloodPrimeReq = 0x9800, // 152 + ID_AdjustBloodPrimeRsp = 0x9900, // 153 + // In-Treatment Adjustables ID_AdjustPressuresLimitsReq = 0x7200, // 114 //// ----- @LEAHIZED ID_AdjustPressuresLimitsRsp = 0x7300, // 115 //// ----- @LEAHIZED @@ -282,6 +287,15 @@ ID_AdjustUltrafiltrationConfirmReq = 0x6600, // 102 //// ----- @LEAHIZED ID_AdjustUltrafiltrationConfirmRsp = 0x6700, // 103 //// ----- @LEAHIZED + ID_AdjustIsolatedUFDurationEditReq = 0x9B00, // 155 //// ----- @LEAHIZED + ID_AdjustIsolatedUFDurationEditRsp = 0x9C00, // 156 //// ----- @LEAHIZED + + ID_AdjustIsolatedUFVolumeEditReq = 0x9D00, // 157 //// ----- @LEAHIZED + ID_AdjustIsolatedUFVolumeEditRsp = 0x9E00, // 158 //// ----- @LEAHIZED + + ID_AdjustIsolatedUFConfirmReq = 0x9F00, // 159 //// ----- @LEAHIZED + ID_AdjustIsolatedUFConfirmRsp = 0xA000, // 160 //// ----- @LEAHIZED + // End-Treatment // Rinseback ID_AdjustRinsebackReq = 0x9000, // 144 //// ----- @LEAHIZED @@ -314,8 +328,8 @@ ID_TreatmentLogEventData = 0x960F, // 150 //// ----- @CRAPIZED: had to change to avoid duplication // Disinfect - ID_AdjustDisinfectModeReq = 0x9A00, // 154 - ID_AdjustDisinfectModeRsp = 0x9B00, // 155 + ID_AdjustDisinfectModeReq = 0x9A0F, // 154 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustDisinfectModeRsp = 0x9B0F, // 155 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustDisinfectStartReq = 0x7F0F, // 127 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustDisinfectStartRsp = 0x800F, // 128 //// ----- @CRAPIZED: had to change to avoid duplication @@ -475,6 +489,7 @@ typedef GuiActions::Requested_Treatment_Recirc_User_Actions GuiRecirculateCommands; // Blood Prime typedef GuiActions::Blood_Prime_States GuiBloodPrimeStates; + typedef GuiActions::Requested_Blood_Prime_User_Actions GuiBloodPrimeCommands; // Treatment End typedef GuiActions::Treatment_End_States GuiTreatmentEndStates; typedef GuiActions::Requested_Treatment_End_User_Actions GuiTreatmentEndCommands;