Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r23702849ec73a0c38c504afb42714e7bee13cfa9 -r472f06f3448ba0708f4b2592e202b45ce76f6836 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 23702849ec73a0c38c504afb42714e7bee13cfa9) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 472f06f3448ba0708f4b2592e202b45ce76f6836) @@ -72,11 +72,12 @@ // ----- {Gui::GuiActionType::ID_TreatmentTime , 3 * 4 }, // 3 parameters each 4bytes - {Gui::GuiActionType::ID_BloodFlow , 10 * 4 }, //10 parameters each 4bytes + {Gui::GuiActionType::ID_BloodFlow , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_DialysateInletFlow , 10 * 4 }, //10 parameters each 4bytes {Gui::GuiActionType::ID_DialysateOutletFlow , 13 * 4 }, //13 parameters each 4bytes {Gui::GuiActionType::ID_PressureOcclusion , 12 * 4 }, //12 parameters each 4bytes - {Gui::GuiActionType::ID_Saline , 3 * 4 }, // 3 parameters each 4bytes + {Gui::GuiActionType::ID_Saline , 4 * 4 }, // 4 parameters each 4bytes + {Gui::GuiActionType::ID_Ultrafiltration , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_Heparin , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_Rinseback , 6 * 4 }, // 6 parameters each 4bytes {Gui::GuiActionType::ID_Recirculate , 2 * 4 }, // 2 parameters each 4bytes @@ -102,19 +103,20 @@ {Gui::GuiActionType::ID_DGLoadCellReadingsData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_DGTemperaturesData , 23 * 4 }, // 23 parameters each 4bytes {Gui::GuiActionType::ID_DGAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes - {Gui::GuiActionType::ID_DGConductivityData , 13 * 4 }, // 13 parameters each 4bytes + {Gui::GuiActionType::ID_DDConductivityData , 5 * 4 }, // 5 parameters each 4bytes + {Gui::GuiActionType::ID_DDGenDialysateData , 9 * 4 }, // 9 parameters each 4bytes // HD Data Messages {Gui::GuiActionType::ID_HDAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_HDSyringePumpData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_HDUsageInfoReq , 0 * 4 }, // 0 parameters each 4bytes {Gui::GuiActionType::ID_HDUsageInfoRsp , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2 bytes {Gui::GuiActionType::ID_TDVoltageData , 11 * 4 }, //11 parameters each 4bytes - {Gui::GuiActionType::ID_TDBloodPumpData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_TDValvesData , 3 * 4 + 2*2 }, // 5 parameters each 4bytes + 2 parametres 2 bytes {Gui::GuiActionType::ID_TDEjectorData , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_TDSwitchesData , 1 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_TDBatteryData , 2 * 4 }, // 2 parameters each 4bytes //// TODO: The payload is TBD (as indicated by the provided screen items) {Gui::GuiActionType::ID_TDTemperatureData , 1 * 4 }, // 1 parameters each 4bytes //// TODO: The payload is TBD (as indicated by the provided screen items) + {Gui::GuiActionType::ID_TreatmentSetPointData , 3 * 4 }, // 3 parameters each 4bytes // ---- TODO : AFTER GIVING IT SOME THOUGHT, IT SEEMS WE CAN GET THESE LEN FROM THE MODEL AND DO NOT NEED TO HAVE THIS BUT NEED TO INVESTIGATE MORE. {Gui::GuiActionType::ID_AlarmStatus , 4 * 3 + 2 }, // 3 parameters each 4bytes + 1 parameter 2bytes Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r712f4c8a1b2382919300895b4422b831471044a3 -r472f06f3448ba0708f4b2592e202b45ce76f6836 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 712f4c8a1b2382919300895b4422b831471044a3) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 472f06f3448ba0708f4b2592e202b45ce76f6836) @@ -127,13 +127,14 @@ // ----- 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, // 11 //// ----- @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 @@ -175,13 +176,13 @@ ID_SelfTestDryData = 0x6300, // 99 // Pre-Treatment Disposable Priming ID_AdjustDisposablesPrimeReq = 0x3C00, // 60 - ID_AdjustDisposablesPrimeRsp = 0x3D00, // 61 + 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_DGPressuresData = 0x2000, // 32 ID_DGDrainPumpData = 0x2400, // 36 ID_DGOperationModeData = 0x2700, // 39 @@ -201,7 +202,8 @@ ID_DGLoadCellReadingsData = 0x0C00, // 12 ID_DGTemperaturesData = 0x2D00, // 45 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 @@ -210,12 +212,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_TDSwitchesData = 0x2100, // 33 //// ----- @LEAHIZED ID_TDEjectorData = 0x4E00, // 78 //// ----- @LEAHIZED ID_TDTemperatureData = 0x9100, //146 //// ----- TODO: MsgID subject to change given FW implementation + ID_TreatmentSetPointData = 0x4F00, // 79 //// ----- @LEAHIZED // In-Treatment Adjustables ID_AdjustDurationReq = 0x160F, // 22 //// ----- @CRAPIZED: had to change to avoid duplication @@ -237,7 +239,7 @@ 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 Index: sources/gui/qml/main.qml =================================================================== diff -u -r712f4c8a1b2382919300895b4422b831471044a3 -r472f06f3448ba0708f4b2592e202b45ce76f6836 --- sources/gui/qml/main.qml (.../main.qml) (revision 712f4c8a1b2382919300895b4422b831471044a3) +++ sources/gui/qml/main.qml (.../main.qml) (revision 472f06f3448ba0708f4b2592e202b45ce76f6836) @@ -29,7 +29,6 @@ import VHDAirBubble 0.1 import VTDAirTrap 0.1 import VTDVoltage 0.1 -import VTDBloodPump 0.1 import VTDValves 0.1 import VTDBattery 0.1 import VTDSwitches 0.1 @@ -69,6 +68,7 @@ import VTreatmentPressureOcclusion 0.1 import VTreatmentUltrafiltration 0.1 import VTreatmentTime 0.1 +import VTreatmentSetPoint 0.1 import VTreatmentRinseback 0.1 import VTreatmentRecirculate 0.1 import VTreatmentBloodPrime 0.1 @@ -100,7 +100,8 @@ import VDGValvesStates 0.1 import VTreatmentCreate 0.1 import VDGAccelerometer 0.1 -import VDGConductivity 0.1 +import VDDConductivity 0.1 +import VDDGenDialysate 0.1 // In-Treatment - Adjustemnt import VTreatmentAdjustmentDuration 0.1 import VTreatmentAdjustmentFlows 0.1 @@ -191,7 +192,6 @@ VHDBloodLeak { id: vHDBloodLeak } VTDAirTrap { id: vTDAirTrap } VTDVoltage { id: vTDVoltage } - VTDBloodPump { id: vTDBloodPump } VTDValves { id: vTDValves } VTDBattery { id: vTDBattery } VTDSwitches { id: vTDSwitches } @@ -202,6 +202,7 @@ VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion } VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } VTreatmentTime { id: vTreatmentTime } + VTreatmentSetPoint { id: vTreatmentSetPoint } VTreatmentBloodPrime { id: vTreatmentBloodPrime } VTreatmentRinseback { id: vTreatmentRinseback } VTreatmentRecirculate { id: vTreatmentRecirculate } @@ -217,7 +218,8 @@ VDGTemperatures { id: vDGTemperatures } VDGValvesStates { id: vDGValvesStates } VDGAccelerometer { id: vDGAccelerometer } - VDGConductivity { id: vDGConductivity } + VDDConductivity { id: vDDConductivity } + VDDGenDialysate { id: vDDGenDialysate } // --- Pre-Treatment Progress Data VPreTreatmentAdjustmentInitTreatment { id: vPreTreatmentAdjustmentInitTreatment } VDGFilterFlush { id: vDGFilterFlush }