Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r4e521c1a06ac5ba8fa125f9efba8a1b3c91c525a -rf1e0e3ab13b12c450d52668608c92b33aa1d2c91 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 4e521c1a06ac5ba8fa125f9efba8a1b3c91c525a) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision f1e0e3ab13b12c450d52668608c92b33aa1d2c91) @@ -100,8 +100,8 @@ ID_AdjustVersionsTDReq = 0x1500, // 21 // ID_TDVersionsRxq - TD Version request received //// ----- @LEAHIZED ID_AdjustVersionsTDRsp = 0x0E00, // 14 //// ----- @LEAHIZED ID_AdjustVersionsDDRsp = 0x0F00, // 15 //// ----- @LEAHIZED - ID_AdjustSerialTDRsp = 0x9900, // 153 //// ----- TODO: Update message ID and payload once defined in FW - ID_AdjustSerialDDRsp = 0x8800, // 136 //// ----- TODO: Update message ID and payload once defined in FW + ID_AdjustSerialTDRsp = 0x5100, // 81 //// ----- @LEAHIZED + ID_AdjustSerialDDRsp = 0x5200, // 82 //// ----- @LEAHIZED // Service Information ID_AdjustServiceDatesReq = 0x8900, // 137 @@ -122,18 +122,19 @@ // State Messages ID_TDOpModeData = 0x1200, // 18 //// ----- @LEAHIZED ID_PreTreatmentStates = 0x5C00, // 92 - ID_TreatmentStates = 0x0F0F, // 15 //// ----- @CRAPIZED: had to change to avoid duplication + ID_TreatmentStates = 0x3C00, // 60 //// ----- @LEAHIZED ID_PostTreatmentStates = 0x7700, // 119 // ----- ID_PowerOff = 0x010F, // 010F //// ----- @CRAPIZED - ID_ShuttingDown = 0x0E0F, // 35 //// ----- @CRAPIZED: had to change to avoid duplication - ID_TreatmentTime = 0x0D0F, // //// ----- @CRAPIZED: had to change to avoid duplication - ID_BloodFlow = 0x0500, + ID_ShuttingDown = 0x0E0F, // 35 //// ----- @CRAPIZED: had to change to avoid duplication + ID_TreatmentTime = 0x3B00, // 59 //// ----- @LEAHIZED + ID_BloodFlow = 0x1100, // 17 //// ----- @LEAHIZED ID_DialysateInletFlow = 0x0800, ID_DialysateOutletFlow = 0x0B00, - ID_PressureOcclusion = 0x0900, - ID_Saline = 0x2F00, // 47 + ID_PressureOcclusion = 0x2400, // 36 //// ----- @LEAHIZED + ID_Saline = 0x3D00, // 61 //// ----- @LEAHIZED + ID_Ultrafiltration = 0x3E00, // 62 //// ----- @LEAHIZED ID_Heparin = 0x4D00, // 77 ID_Rinseback = 0x5600, // 86 ID_Recirculate = 0x5A00, // 90 @@ -174,14 +175,14 @@ // Pre-Treatment SelfTest Dry Progress Data ID_SelfTestDryData = 0x6300, // 99 // Pre-Treatment Disposable Priming - ID_AdjustDisposablesPrimeReq = 0x3C00, // 60 - ID_AdjustDisposablesPrimeRsp = 0x3D00, // 61 + ID_AdjustDisposablesPrimeReq = 0x3C0F, // 60 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustDisposablesPrimeRsp = 0x3D0F, // 61 //// ----- @CRAPIZED: had to change to avoid duplication ID_DisposablesPrimeData = 0x43FF, // ?? //// ----- @CRAPIZED - FFed // Pre-Treatment Patient Connection Begin ID_AdjustPatientConnectionBeginReq = 0x6400, // 100 ID_AdjustPatientConnectionBeginRsp = 0x6500, // 101 // Pre-Treatment Ultrafiltration initial volume - ID_AdjustUltrafiltrationInitReq = 0x4F00, // 79 + ID_AdjustUltrafiltrationInitReq = 0x4F0F, // 79 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustUltrafiltrationInitRsp = 0x5000, // 80 // Pre-Treatment Patient Connection Confirm ID_AdjustPatientConnectionConfirmReq = 0x6600, // 102 @@ -191,7 +192,7 @@ ID_AdjustStartTreatmentRsp = 0x7200, // 114 // DG Data Messages - ID_DGROPumpData = 0x1F00, // 31 + ID_DGROPumpData = 0x1F0F, // 31 //// ----- @CRAPIZED: had to change to avoid duplication ID_DDPressuresData = 0x1C00, // 28 //// ----- @LEAHIZED ID_DGDrainPumpData = 0x2400, // 36 ID_DGOperationModeData = 0x2700, // 39 @@ -204,7 +205,8 @@ ID_DDHeatersData = 0x2800, // 40 //// ----- @LEAHIZED ID_DDLevelData = 0x2900, // 41 //// ----- @LEAHIZED ID_DGAccelerometerData = 0x3400, // 52 - ID_DGConductivityData = 0x3100, // 49 + ID_DDConductivityData = 0x1F00, // 31 //// ----- @LEAHIZED + ID_DDGenDialysateData = 0x2F00, // 47 //// ----- @LEAHIZED // HD Data Messages ID_HDAccelerometerData = 0x3300, // 51 @@ -213,12 +215,12 @@ ID_HDAirBubbleData = 0x9300, // 147 ID_TDAirTrapData = 0x2A00, // 42 //// ----- @LEAHIZED ID_TDVoltageData = 0x1D00, // 29 //// ----- @LEAHIZED - ID_TDBloodPumpData = 0x1100, // 17 //// ----- @LEAHIZED ID_TDValvesData = 0x2B00, // 43 //// ----- @LEAHIZED - ID_TDBatteryData = 0x9400, //149 //// ----- TODO: MsgID subject to change given FW implementation + ID_TDBatteryData = 0x5400, // 84 //// ----- TODO: Payload subject to change given FW implementation ID_TDSwitchesData = 0x2100, // 33 //// ----- @LEAHIZED ID_TDEjectorData = 0x4E00, // 78 //// ----- @LEAHIZED - ID_TDTemperatureData = 0x9100, //146 //// ----- TODO: MsgID subject to change given FW implementation + ID_TDTemperatureData = 0x5300, // 83 //// ----- TODO: Payload subject to change given FW implementation + ID_TreatmentParametersSetPointData = 0x4F00, // 79 //// ----- @LEAHIZED // In-Treatment Adjustables ID_AdjustDurationReq = 0x160F, // 22 //// ----- @CRAPIZED: had to change to avoid duplication @@ -240,19 +242,19 @@ ID_AdjustUltrafiltrationStateReq = 0x100F, // 16 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustUltrafiltrationStateRsp = 0x4100, // 65 - ID_AdjustUltrafiltrationEditReq = 0x1100, // 17 + ID_AdjustUltrafiltrationEditReq = 0x110F, // 17 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustUltrafiltrationEditRsp = 0x1300, // 19 ID_AdjustUltrafiltrationConfirmReq = 0x150F, // 21 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustUltrafiltrationConfirmRsp = 0x2E00, // 46 // End-Treatment // Rinseback - ID_AdjustRinsebackReq = 0x5200, // 82 - ID_AdjustRinsebackRsp = 0x5300, // 83 + ID_AdjustRinsebackReq = 0x520F, // 82 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustRinsebackRsp = 0x530F, // 83 //// ----- @CRAPIZED: had to change to avoid duplication // Recirculate - ID_AdjustRecirculateReq = 0x5400, // 84 + ID_AdjustRecirculateReq = 0x540F, // 84 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustRecirculateRsp = 0x5500, // 85 // Treatment End