Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r6760e0994f220fb0e31f675d6b3b74477560bdde -r482949dd876ebec823e955670b3d9f3834e9c215 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 6760e0994f220fb0e31f675d6b3b74477560bdde) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 482949dd876ebec823e955670b3d9f3834e9c215) @@ -72,8 +72,8 @@ // ----- {Gui::GuiActionType::ID_TreatmentTime , 3 * 4 }, // 3 parameters each 4bytes - {Gui::GuiActionType::ID_BloodFlow , 8 * 4 }, // 8 parameters each 4bytes - {Gui::GuiActionType::ID_DialysateInletFlow , 7 * 4 }, // 7 parameters each 4bytes + {Gui::GuiActionType::ID_BloodFlow , 10 * 4 }, //10 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 @@ -84,7 +84,7 @@ {Gui::GuiActionType::ID_TreatmentStop , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_HDAirBubbleData , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_HDAirTrapData , 4 * 4 }, // 4 parameters each 4bytes - {Gui::GuiActionType::ID_HDBloodLeakData , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_HDBloodLeakData , 4 * 4 }, // 4 parameters each 4bytes // ---- {Gui::GuiActionType::ID_HDOperationModeData , 2 * 4 }, // 2 parameter each 4bytes {Gui::GuiActionType::ID_PreTreatmentStates , 11 * 4 }, //11 parameters each 4bytes @@ -98,7 +98,7 @@ {Gui::GuiActionType::ID_DGOperationModeData , 2 * 4 }, // 2 parameter each 4bytes {Gui::GuiActionType::ID_DGReservoirData , 12 * 4 }, // 12 parameters each 4bytes {Gui::GuiActionType::ID_DGValvesStatesData , 1 * 2 + 13 }, // 1 parameter 16bits & 13 parameters each 1 byte - {Gui::GuiActionType::ID_DGHeatersData , 11 * 4 }, // 11 parameters each 4bytes + {Gui::GuiActionType::ID_DGHeatersData , 13 * 4 }, // 13 parameters each 4bytes {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 Index: sources/model/dg/data/MDGHeatersData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r482949dd876ebec823e955670b3d9f3834e9c215 --- sources/model/dg/data/MDGHeatersData.cpp (.../MDGHeatersData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/dg/data/MDGHeatersData.cpp (.../MDGHeatersData.cpp) (revision 482949dd876ebec823e955670b3d9f3834e9c215) @@ -29,6 +29,8 @@ _data.mPrimaryCalcTargetTemp .value, _data.mTrimmerCalcCurrentTemp .value, _data.mTrimmerUseLastDC .value, + _data.mTrimmerPreviousFlow .value, + _data.mTrimmerContolCounter .value, }; } @@ -46,6 +48,8 @@ if (GetValue(vByteArray, index, _data.mPrimaryCalcTargetTemp )) if (GetValue(vByteArray, index, _data.mTrimmerCalcCurrentTemp )) if (GetValue(vByteArray, index, _data.mTrimmerUseLastDC )) + if (GetValue(vByteArray, index, _data.mTrimmerPreviousFlow )) + if (GetValue(vByteArray, index, _data.mTrimmerContolCounter )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -58,6 +62,8 @@ else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -78,5 +84,7 @@ data.mPrimaryCalcTargetTemp = _data.mPrimaryCalcTargetTemp .value; data.mTrimmerCalcCurrentTemp = _data.mTrimmerCalcCurrentTemp .value; data.mTrimmerUseLastDC = _data.mTrimmerUseLastDC .value; + data.mTrimmerPreviousFlow = _data.mTrimmerPreviousFlow .value; + data.mTrimmerContolCounter = _data.mTrimmerContolCounter .value; return data; } Index: sources/model/dg/data/MDGHeatersData.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r482949dd876ebec823e955670b3d9f3834e9c215 --- sources/model/dg/data/MDGHeatersData.h (.../MDGHeatersData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/dg/data/MDGHeatersData.h (.../MDGHeatersData.h) (revision 482949dd876ebec823e955670b3d9f3834e9c215) @@ -47,6 +47,8 @@ * | # 9:(F32) | \ref Data::mPrimaryCalcTargetTemp | * | #10:(F32) | \ref Data::mTrimmerCalcCurrentTemp | * | #11:(F32) | \ref Data::mTrimmerUseLastDC | + * | #12:(F32) | \ref Data::mTrimmerPreviousFlow | + * | #13:(U32) | \ref Data::mTrimmerContolCounter | * * \sa Data * @@ -77,6 +79,8 @@ Types::F32 mPrimaryCalcTargetTemp ; ///< Primary heater calculated target temperature Types::F32 mTrimmerCalcCurrentTemp ; ///< Trimmer heater calculated current temperature Types::U32 mTrimmerUseLastDC ; ///< Trimmer heater use last duty cycle + Types::F32 mTrimmerPreviousFlow ; ///< Trimmer previous flow + Types::U32 mTrimmerContolCounter ; ///< Trimmer control counter } _data; public: @@ -97,6 +101,8 @@ float mPrimaryCalcTargetTemp = 0; ///< Primary heater calculated target temperature float mTrimmerCalcCurrentTemp = 0; ///< Trimmer heater calculated current temperature quint32 mTrimmerUseLastDC = 0; ///< Trimmer heater use last duty cycle + float mTrimmerPreviousFlow = 0; ///< Trimmer previous flow + quint32 mTrimmerContolCounter = 0; ///< Trimmer control counter }; MDGHeaters () {} Index: sources/model/hd/data/MHDBloodLeakData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r482949dd876ebec823e955670b3d9f3834e9c215 --- sources/model/hd/data/MHDBloodLeakData.cpp (.../MHDBloodLeakData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/MHDBloodLeakData.cpp (.../MHDBloodLeakData.cpp) (revision 482949dd876ebec823e955670b3d9f3834e9c215) @@ -18,18 +18,24 @@ QVariantList MHDBloodLeakData::parameters() const { return { - _data.mBloodLeakStatus .value, - _data.mBloodLeakState .value, + _data.mBloodLeakStatus .value, + _data.mBloodLeakState .value, + _data.mBloodLeakPersistentCounter .value, + _data.mBloodLeakSerialCommState .value, }; } bool MHDBloodLeakData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if (GetValue(vByteArray, index, _data.mBloodLeakStatus )) if (GetValue(vByteArray, index, _data.mBloodLeakState )) + if (GetValue(vByteArray, index, _data.mBloodLeakPersistentCounter )) + if (GetValue(vByteArray, index, _data.mBloodLeakSerialCommState )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -39,8 +45,10 @@ */ MHDBloodLeakData::Data MHDBloodLeakData::data() const{ Data data; - data.mBloodLeakStatus = _data.mBloodLeakStatus .value; - data.mBloodLeakState = _data.mBloodLeakState .value; + data.mBloodLeakStatus = _data.mBloodLeakStatus .value; + data.mBloodLeakState = _data.mBloodLeakState .value; + data.mBloodLeakPersistentCounter = _data.mBloodLeakPersistentCounter .value; + data.mBloodLeakSerialCommState = _data.mBloodLeakSerialCommState .value; return data; } Index: sources/model/hd/data/MHDBloodLeakData.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r482949dd876ebec823e955670b3d9f3834e9c215 --- sources/model/hd/data/MHDBloodLeakData.h (.../MHDBloodLeakData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/MHDBloodLeakData.h (.../MHDBloodLeakData.h) (revision 482949dd876ebec823e955670b3d9f3834e9c215) @@ -40,6 +40,8 @@ * | || * | #01:(U32) | \ref Data::mBloodLeakStatus | * | #02:(U32) | \ref Data::mBloodLeakState | + * | #03:(U32) | \ref Data::mBloodLeakPersistentCounter | + * | #04:(U32) | \ref Data::mBloodLeakSerialCommState | * * \sa Data * @@ -61,6 +63,8 @@ struct { Types::U32 mBloodLeakStatus ; Types::U32 mBloodLeakState ; + Types::U32 mBloodLeakPersistentCounter ; + Types::U32 mBloodLeakSerialCommState ; } _data; public: @@ -72,6 +76,8 @@ struct Data { quint32 mBloodLeakStatus = 0; quint32 mBloodLeakState = 0; + quint32 mBloodLeakPersistentCounter = 0; + quint32 mBloodLeakSerialCommState = 0; }; MHDBloodLeakData () { } Index: sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r482949dd876ebec823e955670b3d9f3834e9c215 --- sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp (.../MTreatmentBloodFlowData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp (.../MTreatmentBloodFlowData.cpp) (revision 482949dd876ebec823e955670b3d9f3834e9c215) @@ -27,6 +27,7 @@ _data.mPWMDutyCycle .value, _data.mRotorCount .value, _data.mPresFlow .value, + _data.mRotorHall .value, }; } @@ -41,6 +42,7 @@ if (GetValue(vByteArray, index, _data.mPWMDutyCycle )) if (GetValue(vByteArray, index, _data.mRotorCount )) if (GetValue(vByteArray, index, _data.mPresFlow )) + if (GetValue(vByteArray, index, _data.mRotorHall )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -51,6 +53,7 @@ else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! Index: sources/model/hd/data/treatment/MTreatmentBloodFlowData.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r482949dd876ebec823e955670b3d9f3834e9c215 --- sources/model/hd/data/treatment/MTreatmentBloodFlowData.h (.../MTreatmentBloodFlowData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/treatment/MTreatmentBloodFlowData.h (.../MTreatmentBloodFlowData.h) (revision 482949dd876ebec823e955670b3d9f3834e9c215) @@ -35,15 +35,16 @@ * * | Payload || * | || - * | #1:(S32) | \ref Data::mFlowSetPoint | - * | #2:(F32) | \ref Data::mMeasuredFlow | - * | #3:(F32) | \ref Data::mRotorSpeed | - * | #4:(F32) | \ref Data::mMotorSpeed | - * | #5:(F32) | \ref Data::mMotorCtlSpeed | - * | #6:(F32) | \ref Data::mMotorCtlCurrent | - * | #7:(F32) | \ref Data::mPWMDutyCycle | - * | #8:(U32) | \ref Data::mRotorCount | - * | #9:(U32) | \ref Data::mPresFlow | + * | #1 :(S32) | \ref Data::mFlowSetPoint | + * | #2 :(F32) | \ref Data::mMeasuredFlow | + * | #3 :(F32) | \ref Data::mRotorSpeed | + * | #4 :(F32) | \ref Data::mMotorSpeed | + * | #5 :(F32) | \ref Data::mMotorCtlSpeed | + * | #6 :(F32) | \ref Data::mMotorCtlCurrent | + * | #7 :(F32) | \ref Data::mPWMDutyCycle | + * | #8 :(U32) | \ref Data::mRotorCount | + * | #9 :(U32) | \ref Data::mPresFlow | + * | #10:(U32) | \ref Data::mRotorHall | * * \sa Data * @@ -70,6 +71,7 @@ Types::F32 mPWMDutyCycle ; ///< PWM Duty Cycle in % Types::U32 mRotorCount ; ///< Rotor Count Types::U32 mPresFlow ; ///< Prescribed flow rate + Types::U32 mRotorHall ; ///< Rotor hall sensor value } _data; QVariantList parameters() const override; @@ -88,6 +90,7 @@ float mPWMDutyCycle = 0; ///< PWM Duty Cycle in % quint32 mRotorCount = 0; ///< Rotor Count quint32 mPresFlow = 0; ///< Prescribed flow rate + quint32 mRotorHall = 0; ///< Rotor Hall Sensor Value }; MBloodFlow() { } Index: sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r482949dd876ebec823e955670b3d9f3834e9c215 --- sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp (.../MTreatmentDialysateFlowData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp (.../MTreatmentDialysateFlowData.cpp) (revision 482949dd876ebec823e955670b3d9f3834e9c215) @@ -27,6 +27,7 @@ _data.mPWMDutyCycle .value, _data.mRotorCount .value, _data.mPresFlow .value, + _data.mRotorHall .value, }; } @@ -41,6 +42,7 @@ if (GetValue(vByteArray, index, _data.mPWMDutyCycle )) if (GetValue(vByteArray, index, _data.mRotorCount )) if (GetValue(vByteArray, index, _data.mPresFlow )) + if (GetValue(vByteArray, index, _data.mRotorHall )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -51,6 +53,7 @@ else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -70,5 +73,6 @@ data.mPWMDutyCycle = _data.mPWMDutyCycle .value; data.mRotorCount = _data.mRotorCount .value; data.mPresFlow = _data.mPresFlow .value; + data.mRotorHall = _data.mRotorHall .value; return data; } Index: sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r482949dd876ebec823e955670b3d9f3834e9c215 --- sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h (.../MTreatmentDialysateFlowData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h (.../MTreatmentDialysateFlowData.h) (revision 482949dd876ebec823e955670b3d9f3834e9c215) @@ -36,15 +36,16 @@ * * | Payload || * | || - * | #1:(S32) | \ref Data::mFlowSetPoint | - * | #2:(F32) | \ref Data::mMeasuredFlow | - * | #3:(F32) | \ref Data::mRotorSpeed | - * | #4:(F32) | \ref Data::mMotorSpeed | - * | #5:(F32) | \ref Data::mMotorCtlSpeed | - * | #6:(F32) | \ref Data::mMotorCtlCurrent | - * | #7:(F32) | \ref Data::mPWMDutyCycle | - * | #8:(U32) | \ref Data::mRotorCount | - * | #9:(U32) | \ref Data::mPresFlow | + * | #1 :(S32) | \ref Data::mFlowSetPoint | + * | #2 :(F32) | \ref Data::mMeasuredFlow | + * | #3 :(F32) | \ref Data::mRotorSpeed | + * | #4 :(F32) | \ref Data::mMotorSpeed | + * | #5 :(F32) | \ref Data::mMotorCtlSpeed | + * | #6 :(F32) | \ref Data::mMotorCtlCurrent | + * | #7 :(F32) | \ref Data::mPWMDutyCycle | + * | #8 :(U32) | \ref Data::mRotorCount | + * | #9 :(U32) | \ref Data::mPresFlow | + * | #10:(U32) | \ref Data::mRotorHall | * * \sa Data * @@ -73,6 +74,7 @@ Types::F32 mPWMDutyCycle ; ///< PWM Duty Cycle in % Types::U32 mRotorCount ; ///< Rotor Count Types::U32 mPresFlow ; ///< Prescribed flow rate + Types::U32 mRotorHall ; ///< Rotor hall sensor value } _data; public: @@ -90,6 +92,7 @@ float mPWMDutyCycle = 0; ///< PWM Duty Cycle in % quint32 mRotorCount = 0; ///< Rotor Count quint32 mPresFlow = 0; ///< Prescribed flow rate + quint32 mRotorHall = 0; ///< Rotor hall sensor value }; MDialysateFlow() { } Index: sources/view/dg/data/VDGHeatersData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r482949dd876ebec823e955670b3d9f3834e9c215 --- sources/view/dg/data/VDGHeatersData.cpp (.../VDGHeatersData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/dg/data/VDGHeatersData.cpp (.../VDGHeatersData.cpp) (revision 482949dd876ebec823e955670b3d9f3834e9c215) @@ -32,4 +32,6 @@ primaryCalcTargetTemp ( vData.mPrimaryCalcTargetTemp ); trimmerCalcCurrentTemp ( vData.mTrimmerCalcCurrentTemp ); trimmerUseLastDC ( vData.mTrimmerUseLastDC ); + trimmerPreviousFlow ( vData.mTrimmerPreviousFlow ); + trimmerControlCounter ( vData.mTrimmerContolCounter ); } Index: sources/view/dg/data/VDGHeatersData.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r482949dd876ebec823e955670b3d9f3834e9c215 --- sources/view/dg/data/VDGHeatersData.h (.../VDGHeatersData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/dg/data/VDGHeatersData.h (.../VDGHeatersData.h) (revision 482949dd876ebec823e955670b3d9f3834e9c215) @@ -47,6 +47,8 @@ PROPERTY( float , primaryCalcTargetTemp , 0) PROPERTY( float , trimmerCalcCurrentTemp , 0) PROPERTY( quint32 , trimmerUseLastDC , 0) + PROPERTY( float , trimmerPreviousFlow , 0) + PROPERTY( quint32 , trimmerControlCounter , 0) VIEW_DEC(VDGHeaters, DGHeatersData) }; Index: sources/view/hd/data/VHDBloodLeakData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r482949dd876ebec823e955670b3d9f3834e9c215 --- sources/view/hd/data/VHDBloodLeakData.cpp (.../VHDBloodLeakData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/hd/data/VHDBloodLeakData.cpp (.../VHDBloodLeakData.cpp) (revision 482949dd876ebec823e955670b3d9f3834e9c215) @@ -22,4 +22,6 @@ void VHDBloodLeak::onActionReceive(const HDBloodLeakData &vData) { bloodLeakStatus (vData.mBloodLeakStatus ); bloodLeakState (vData.mBloodLeakState ); + bloodLeakPersistentCounter (vData.mBloodLeakPersistentCounter ); + bloodLeakSerialCommState (vData.mBloodLeakSerialCommState ); } Index: sources/view/hd/data/VHDBloodLeakData.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r482949dd876ebec823e955670b3d9f3834e9c215 --- sources/view/hd/data/VHDBloodLeakData.h (.../VHDBloodLeakData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/hd/data/VHDBloodLeakData.h (.../VHDBloodLeakData.h) (revision 482949dd876ebec823e955670b3d9f3834e9c215) @@ -37,6 +37,8 @@ PROPERTY( quint32 , bloodLeakStatus , 0) PROPERTY( quint32 , bloodLeakState , 0) + PROPERTY( quint32 , bloodLeakPersistentCounter , 0) + PROPERTY( quint32 , bloodLeakSerialCommState , 0) VIEW_DEC(VHDBloodLeak, HDBloodLeakData) }; Index: sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r482949dd876ebec823e955670b3d9f3834e9c215 --- sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp (.../VTreatmentBloodFlow.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp (.../VTreatmentBloodFlow.cpp) (revision 482949dd876ebec823e955670b3d9f3834e9c215) @@ -30,4 +30,5 @@ bloodFlow_PWMDutyCycle (vData.mPWMDutyCycle ); bloodFlow_RotorCount (vData.mRotorCount ); bloodFlow_PresFlow (vData.mPresFlow ); + bloodFlow_RotorHall (vData.mRotorHall ); } Index: sources/view/hd/data/treatment/VTreatmentBloodFlow.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r482949dd876ebec823e955670b3d9f3834e9c215 --- sources/view/hd/data/treatment/VTreatmentBloodFlow.h (.../VTreatmentBloodFlow.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/hd/data/treatment/VTreatmentBloodFlow.h (.../VTreatmentBloodFlow.h) (revision 482949dd876ebec823e955670b3d9f3834e9c215) @@ -45,6 +45,7 @@ PROPERTY( float , bloodFlow_PWMDutyCycle , 0) PROPERTY( quint32, bloodFlow_RotorCount , 0) PROPERTY( quint32, bloodFlow_PresFlow , 0) + PROPERTY( quint32, bloodFlow_RotorHall , 0) VIEW_DEC(VTreatmentBloodFlow, BloodFlowData) }; Index: sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r482949dd876ebec823e955670b3d9f3834e9c215 --- sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp (.../VTreatmentDialysateFlow.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp (.../VTreatmentDialysateFlow.cpp) (revision 482949dd876ebec823e955670b3d9f3834e9c215) @@ -30,4 +30,5 @@ dialysateFlow_PWMDutyCycle (vData.mPWMDutyCycle ); dialysateFlow_RotorCount (vData.mRotorCount ); dialysateFlow_PresFlow (vData.mPresFlow ); + dialysateFlow_RotorHall (vData.mRotorHall ); } Index: sources/view/hd/data/treatment/VTreatmentDialysateFlow.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r482949dd876ebec823e955670b3d9f3834e9c215 --- sources/view/hd/data/treatment/VTreatmentDialysateFlow.h (.../VTreatmentDialysateFlow.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/hd/data/treatment/VTreatmentDialysateFlow.h (.../VTreatmentDialysateFlow.h) (revision 482949dd876ebec823e955670b3d9f3834e9c215) @@ -45,6 +45,7 @@ PROPERTY( float , dialysateFlow_PWMDutyCycle , 0) PROPERTY( quint32, dialysateFlow_RotorCount , 0) PROPERTY( quint32, dialysateFlow_PresFlow , 0) + PROPERTY( quint32, dialysateFlow_RotorHall , 0) VIEW_DEC(VTreatmentDialysateFlow, DialysateFlowData) };