Index: SDDs/WaterSampleDialog.puml =================================================================== diff -u -rdfdd08b0283fe7563c15bed670803bfe7dfaf3e9 -r6d843984ed0b24bc188f96020cd9cc9e18e09906 --- SDDs/WaterSampleDialog.puml (.../WaterSampleDialog.puml) (revision dfdd08b0283fe7563c15bed670803bfe7dfaf3e9) +++ SDDs/WaterSampleDialog.puml (.../WaterSampleDialog.puml) (revision 6d843984ed0b24bc188f96020cd9cc9e18e09906) @@ -35,7 +35,7 @@ US -> UI: TCH: Select Water Sample result (Pass or Fail) US -> UI: TCH: Press Confirm UI -> SW: ACT: Send TD Water Sample Result - SW -> TD: MSG: [xXX: #1] Req \n TD Water Sample Result Request \ + SW -> TD: MSG: [xA3: #1] Req \n TD Water Sample Result Request \ \n\t(U32) mResult == Dialsate Check Tab == Index: sources/gui/GuiGlobals.h =================================================================== diff -u -ref583f0056a0fb8c66a64e132be159719b2bc2f6 -r6d843984ed0b24bc188f96020cd9cc9e18e09906 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision ef583f0056a0fb8c66a64e132be159719b2bc2f6) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 6d843984ed0b24bc188f96020cd9cc9e18e09906) @@ -167,7 +167,7 @@ ID_DGFilterFlushData = 0x600F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustWaterSampleReq = 0x5D00, // 93 ID_AdjustWaterSampleRsp = 0x5E00, // 94 - ID_AdjustWaterSampleResultReq = 0XA900, + ID_AdjustWaterSampleResultReq = 0XA300, // 163 // Pre-Treatment Consumables Installation Confirm ID_AdjustConsumablesConfirmReq = 0x6800, // 104 // 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 NoCartridge Progress Data Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h =================================================================== diff -u -ref583f0056a0fb8c66a64e132be159719b2bc2f6 -r6d843984ed0b24bc188f96020cd9cc9e18e09906 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision ef583f0056a0fb8c66a64e132be159719b2bc2f6) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 6d843984ed0b24bc188f96020cd9cc9e18e09906) @@ -207,7 +207,7 @@ * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------------:| - * |0xA900| 0x100 | 9 | Req | Y | UI | TD | Water Sample Result Request | + * |0xA300| 0x100 | 9 | Req | Y | UI | TD | Water Sample Result Request | * * | Payload || * | ||