Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rc9764bd0ad823c5c1725d7c7f556290c2c459d4d -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision c9764bd0ad823c5c1725d7c7f556290c2c459d4d) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca) @@ -83,10 +83,10 @@ // POST ID_HDPostSingleResultData = 0x8E0F, // 142 //// ----- @CRAPIZED: had to change to avoid duplication - ID_HDPostFinalResultData = 0x8F00, // 143 - ID_DGPostSingleResultData = 0x9000, // 144 - ID_DGPostFinalResultData = 0x9100, // 145 - ID_UIPostFinalResultData = 0x9200, // 146 // ID_UIFinalResultTxr - UI Final Result response/Data transmit + ID_HDPostFinalResultData = 0x8F0F, // 143 //// ----- @CRAPIZED + 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 // ----- Settings @@ -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,7 +137,8 @@ ID_Saline = 0x3D00, // 61 //// ----- @LEAHIZED ID_Ultrafiltration = 0x3E00, // 62 //// ----- @LEAHIZED ID_Heparin = 0x8C00, // 140 - ID_Rinseback = 0x5600, // 86 + ID_IsolatedUF = 0x9A00, // 154 + ID_Rinseback = 0x8F00, // 143 //// ----- @LEAHIZED ID_Recirculate = 0x5A00, // 90 ID_BloodPrime = 0x5900, // 89 ID_TreatmentStop = 0x4900, // 73 @@ -172,8 +173,8 @@ // Pre-Treatment SelfTest NoCartridge Progress Data ID_SelfTestNoCartridgeData = 0x6100, // 97 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response // Pre-Treatment Disposables Installation Confirm - ID_AdjustDisposablesConfirmReq = 0x6200, // 98 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response - ID_AdjustDisposablesConfirmRsp = 0xAD00, // 173 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response + ID_AdjustDisposablesConfirmReq = 0x9200, // 146 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response + ID_AdjustDisposablesConfirmRsp = 0x9300, // 147 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response // Pre-Treatment SelfTest Dry Progress Data ID_SelfTestDryData = 0x630F, // 99 //// ----- @CRAPIZED: had to change to avoid duplication // Pre-Treatment Disposable Priming @@ -282,10 +283,19 @@ 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 = 0x520F, // 82 //// ----- @CRAPIZED: had to change to avoid duplication - ID_AdjustRinsebackRsp = 0x530F, // 83 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustRinsebackReq = 0x9000, // 144 //// ----- @LEAHIZED + ID_AdjustRinsebackRsp = 0x9100, // 145 //// ----- @LEAHIZED // Recirculate ID_AdjustRecirculateReq = 0x540F, // 84 //// ----- @CRAPIZED: had to change to avoid duplication @@ -302,8 +312,8 @@ ID_AdjustPatientDisconnectConfirmRsp = 0x7E0F, // 126 //// ----- @CRAPIZED: had to change to avoid duplication // Disposables Removal - ID_AdjustDisposablesRemovalConfirmReq = 0x730F, // 115 //// ----- @CRAPIZED: had to change to avoid duplication - ID_AdjustDisposablesRemovalConfirmRsp = 0x740F, // 116 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustDisposablesRemovalConfirmReq = 0x9400, // 148 + ID_AdjustDisposablesRemovalConfirmRsp = 0x9500, // 149 // Treatment Log Adjs ID_AdjustTreatmentLogReq = 0x750F, // 117 //// ----- @CRAPIZED: had to change to avoid duplication @@ -314,8 +324,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