Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r1f9e84f74ead9e10577c8caa204c6eb911e12ab8 -r41ba9331e6a540df0c8eced0c4d3b8684afa9afa --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 1f9e84f74ead9e10577c8caa204c6eb911e12ab8) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 41ba9331e6a540df0c8eced0c4d3b8684afa9afa) @@ -86,7 +86,7 @@ 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_UIPostFinalResultData = 0x920F, // 146 //// ----- @CRAPIZED: had to change to avoid duplication ID_UIPostFinalResultHDReq = 0xB200, // 178 // ID_HDFinalResultRxq - HD Final Result request received // ----- Settings @@ -172,8 +172,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 @@ -285,8 +285,8 @@ ID_AdjustPatientDisconnectConfirmRsp = 0x7E00, // 126 // Disposables Removal - ID_AdjustDisposablesRemovalConfirmReq = 0x7300, // 115 - ID_AdjustDisposablesRemovalConfirmRsp = 0x7400, // 116 + ID_AdjustDisposablesRemovalConfirmReq = 0x9400, // 148 + ID_AdjustDisposablesRemovalConfirmRsp = 0x9500, // 149 // Treatment Log Adjs ID_AdjustTreatmentLogReq = 0x7500, // 117