Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r62797b3c6e0539e22a04404e16daa7c4465e178f -r3000579296b1baa02f21dbe44e27f1c7e56e3821 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 3000579296b1baa02f21dbe44e27f1c7e56e3821) @@ -124,7 +124,7 @@ ID_TDOpModeData = 0x1200, // 18 //// ----- @LEAHIZED ID_PreTreatmentStates = 0x5C00, // 92 ID_TreatmentStates = 0x3C00, // 60 //// ----- @LEAHIZED - ID_PostTreatmentStates = 0x7700, // 119 + ID_PostTreatmentStates = 0x770F, // 119 //// ----- @CRAPIZED: had to change to avoid duplication // ----- ID_PowerOff = 0x010F, // 010F //// ----- @CRAPIZED @@ -191,8 +191,8 @@ ID_AdjustPatientConnectionConfirmRsp = 0x670F, // 103 //// ----- @CRAPIZED: had to change to avoid duplication // Pre-Treatment Start Treatment ID_AdjustStartTreatmentReq = 0x7100, // 113 - ID_AdjustStartTreatmentRsp = 0x7200, // 114 - + ID_AdjustStartTreatmentRsp = 0x720F, // 114 //// ----- @CRAPIZED: had to change to avoid duplication + // DG Data Messages ID_DGROPumpData = 0x1F0F, // 31 //// ----- @CRAPIZED: had to change to avoid duplication ID_DGDrainPumpData = 0x240F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication @@ -237,32 +237,32 @@ ID_TreatmentParametersSetPointData = 0x4F00, // 79 //// ----- @LEAHIZED // In-Treatment Adjustables - ID_AdjustBolusVolumeReq = 0x8100, // 122 //// ----- @LEAHIZED - ID_AdjustBolusVolumeRsp = 0x8200, // 123 //// ----- @LEAHIZED + ID_AdjustPressuresLimitsReq = 0x7200, // 114 //// ----- @LEAHIZED + ID_AdjustPressuresLimitsRsp = 0x7300, // 115 //// ----- @LEAHIZED - ID_AdjustDurationEditReq = 0x8300, // 131 //// ----- @LEAHIZED - ID_AdjustDurationEditRsp = 0x8400, // 132 //// ----- @LEAHIZED - ID_AdjustDurationConfirmReq = 0x8500, // 133 //// ----- @LEAHIZED - ID_AdjustDurationConfirmRsp = 0x8600, // 134 //// ----- @LEAHIZED + ID_AdjustBolusVolumeReq = 0x7400, // 116 //// ----- @LEAHIZED + ID_AdjustBolusVolumeRsp = 0x7500, // 117 //// ----- @LEAHIZED - ID_AdjustSetPointsReq = 0x9300, // 147 //// ----- @LEAHIZED - ID_AdjustSetPointsRsp = 0x9400, // 148 //// ----- @LEAHIZED + ID_AdjustDurationEditReq = 0x7600, // 118 //// ----- @LEAHIZED + ID_AdjustDurationEditRsp = 0x7700, // 119 //// ----- @LEAHIZED + ID_AdjustDurationConfirmReq = 0x7800, // 120 //// ----- @LEAHIZED + ID_AdjustDurationConfirmRsp = 0x7900, // 121 //// ----- @LEAHIZED - ID_AdjustBloodFlowRateReq = 0x9500, // 149 //// ----- @LEAHIZED - ID_AdjustBloodFlowRateRsp = 0x9600, // 150 //// ----- @LEAHIZED + ID_AdjustSetPointsReq = 0x7A00, // 122 //// ----- @LEAHIZED + ID_AdjustSetPointsRsp = 0x7B00, // 123 //// ----- @LEAHIZED - ID_AdjustDialysateFlowRateReq = 0x9700, // 151 //// ----- @LEAHIZED - ID_AdjustDialysateFlowRateRsp = 0x9800, // 152 //// ----- @LEAHIZED + ID_AdjustBloodFlowRateReq = 0x7C00, // 124 //// ----- @LEAHIZED + ID_AdjustBloodFlowRateRsp = 0x7D00, // 125 //// ----- @LEAHIZED - ID_AdjustDialysateTemperatureReq = 0x9900, // 153 //// ----- @LEAHIZED - ID_AdjustDialysateTemperatureRsp = 0x9A00, // 154 //// ----- @LEAHIZED + ID_AdjustDialysateFlowRateReq = 0x7E00, // 126 //// ----- @LEAHIZED + ID_AdjustDialysateFlowRateRsp = 0x7F00, // 127 //// ----- @LEAHIZED + ID_AdjustDialysateTemperatureReq = 0x8000, // 128 //// ----- @LEAHIZED + ID_AdjustDialysateTemperatureRsp = 0x8100, // 129 //// ----- @LEAHIZED + ID_AdjustBloodDialysateReq = 0x1700, // 23 ID_AdjustBloodDialysateRsp = 0x1800, // 24 - ID_AdjustPressuresLimitsReq = 0x7800, // 120 //// ----- @LEAHIZED - ID_AdjustPressuresLimitsRsp = 0x7900, // 121 //// ----- @LEAHIZED - ID_AdjustSalineReq = 0x5F00, // 95 ID_AdjustSalineRsp = 0x6000, // 96 @@ -299,15 +299,15 @@ // 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 = 0x7E00, // 126 + ID_AdjustPatientDisconnectConfirmRsp = 0x7E0F, // 126 //// ----- @CRAPIZED: had to change to avoid duplication // Disposables Removal - ID_AdjustDisposablesRemovalConfirmReq = 0x7300, // 115 - ID_AdjustDisposablesRemovalConfirmRsp = 0x7400, // 116 + ID_AdjustDisposablesRemovalConfirmReq = 0x730F, // 115 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustDisposablesRemovalConfirmRsp = 0x740F, // 116 //// ----- @CRAPIZED: had to change to avoid duplication // Treatment Log Adjs - ID_AdjustTreatmentLogReq = 0x7500, // 117 - ID_AdjustTreatmentLogRsp = 0x7600, // 118 + ID_AdjustTreatmentLogReq = 0x750F, // 117 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustTreatmentLogRsp = 0x760F, // 118 //// ----- @CRAPIZED: had to change to avoid duplication // 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 @@ -316,8 +316,8 @@ // Disinfect ID_AdjustDisinfectModeReq = 0x9A00, // 154 ID_AdjustDisinfectModeRsp = 0x9B00, // 155 - ID_AdjustDisinfectStartReq = 0x7F00, // 127 - ID_AdjustDisinfectStartRsp = 0x8000, // 128 + ID_AdjustDisinfectStartReq = 0x7F0F, // 127 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustDisinfectStartRsp = 0x800F, // 128 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustDGCleaningUsageReq = 0xB800, // 184 ID_AdjustDGCleaningUsageRsp = 0x8D00, // 141