Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -raf8d98b36b427e2b5f4d6659fcf3b58ee79eab6a -r32ca8b84563394e35720ec2da6e607d45a128f39 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision af8d98b36b427e2b5f4d6659fcf3b58ee79eab6a) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 32ca8b84563394e35720ec2da6e607d45a128f39) @@ -71,8 +71,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 , 9 * 4 }, // 9 parameters each 4bytes + {Gui::GuiActionType::ID_DialysateInletFlow , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_DialysateOutletFlow , 7 * 4 }, // 7 parameters each 4bytes {Gui::GuiActionType::ID_PressureOcclusion , 5 * 4 }, // 5 parameters each 4bytes {Gui::GuiActionType::ID_Saline , 3 * 4 }, // 3 parameters each 4bytes Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -raf8d98b36b427e2b5f4d6659fcf3b58ee79eab6a -r32ca8b84563394e35720ec2da6e607d45a128f39 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision af8d98b36b427e2b5f4d6659fcf3b58ee79eab6a) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 32ca8b84563394e35720ec2da6e607d45a128f39) @@ -288,6 +288,7 @@ vTreatmentBloodFlow.bloodFlow_MotorCtlCurrent .toFixed(2) , "%" + vTreatmentBloodFlow.bloodFlow_PWMDutyCycle .toFixed(2) , vTreatmentBloodFlow.bloodFlow_RotorCount .toFixed(2) , + vTreatmentBloodFlow.bloodFlow_PresFlow .toFixed(2) , ] label: [ "Tgt.Flow" , @@ -298,6 +299,7 @@ "MC.Cur" , "PWM" , "Rtr.Cnt" , + "Prs.Flow" , ] } @@ -314,6 +316,8 @@ vTreatmentDialysateFlow.dialysateFlow_MotorCtlSpeed .toFixed(2) , vTreatmentDialysateFlow.dialysateFlow_MotorCtlCurrent.toFixed(2) , "%" + vTreatmentDialysateFlow.dialysateFlow_PWMDutyCycle .toFixed(2) , + vTreatmentDialysateFlow.dialysateFlow_RotorCount .toFixed(2) , + vTreatmentDialysateFlow.dialysateFlow_PresFlow .toFixed(2) , ] label: [ "Tgt.Flow" , @@ -323,6 +327,8 @@ "MC.Spd" , "MC.Cur" , "PWM" , + "Rtr.Cnt" , + "Prs.Flow" , ] } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r32ca8b84563394e35720ec2da6e607d45a128f39 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision 32ca8b84563394e35720ec2da6e607d45a128f39) @@ -50,8 +50,8 @@ // reset the flow values to the current flow values function currentFlows() { - _bloodFlowSlider.value = vTreatmentBloodFlow. bloodFlow_FlowSetPoint - _dialysateFlowSlider.value = vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint + _bloodFlowSlider.value = vTreatmentBloodFlow. bloodFlow_PresFlow + _dialysateFlowSlider.value = vTreatmentDialysateFlow.dialysateFlow_PresFlow } // reset the flow values to the values of the adjustment response Index: sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r32ca8b84563394e35720ec2da6e607d45a128f39 --- sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml (.../TreatmentFlows.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml (.../TreatmentFlows.qml) (revision 32ca8b84563394e35720ec2da6e607d45a128f39) @@ -37,15 +37,15 @@ anchors.topMargin: 40 TextRect { id: _bloodFlow title : qsTr("Blood") - label : Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_FlowSetPoint) + label : Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow) extra : Variables.unitTextFlowRate labelFont.weight: Font.ExtraLight width : 180 height: 200 } TextRect { id: _dialysateInletFlow title: qsTr("Dialysate") - label: Variables.notSetVariable(vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint) + label: Variables.notSetVariable(vTreatmentDialysateFlow.dialysateFlow_PresFlow) extra: Variables.unitTextFlowRate labelFont.weight: Font.ExtraLight width: 180 Index: sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r32ca8b84563394e35720ec2da6e607d45a128f39 --- sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp (.../MTreatmentBloodFlowData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp (.../MTreatmentBloodFlowData.cpp) (revision 32ca8b84563394e35720ec2da6e607d45a128f39) @@ -26,6 +26,7 @@ _data.mMotorCtlCurrent .value, _data.mPWMDutyCycle .value, _data.mRotorCount .value, + _data.mPresFlow .value, }; } @@ -39,6 +40,7 @@ if (GetValue(vByteArray, index, _data.mMotorCtlCurrent )) if (GetValue(vByteArray, index, _data.mPWMDutyCycle )) if (GetValue(vByteArray, index, _data.mRotorCount )) + if (GetValue(vByteArray, index, _data.mPresFlow )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -48,6 +50,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; } } /*! @@ -66,5 +69,6 @@ data.mMotorCtlCurrent = _data.mMotorCtlCurrent.value; data.mPWMDutyCycle = _data.mPWMDutyCycle .value; data.mRotorCount = _data.mRotorCount .value; + data.mPresFlow = _data.mPresFlow .value; return data; } Index: sources/model/hd/data/treatment/MTreatmentBloodFlowData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r32ca8b84563394e35720ec2da6e607d45a128f39 --- sources/model/hd/data/treatment/MTreatmentBloodFlowData.h (.../MTreatmentBloodFlowData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/data/treatment/MTreatmentBloodFlowData.h (.../MTreatmentBloodFlowData.h) (revision 32ca8b84563394e35720ec2da6e607d45a128f39) @@ -43,6 +43,7 @@ * | #6:(F32) | \ref Data::mMotorCtlCurrent | * | #7:(F32) | \ref Data::mPWMDutyCycle | * | #8:(U32) | \ref Data::mRotorCount | + * | #9:(U32) | \ref Data::mPresFlow | * * \sa Data * @@ -68,6 +69,7 @@ Types::F32 mMotorCtlCurrent ; ///< Motor Controller Current Types::F32 mPWMDutyCycle ; ///< PWM Duty Cycle in % Types::U32 mRotorCount ; ///< Rotor Count + Types::U32 mPresFlow ; ///< Prescribed flow rate } _data; QVariantList parameters() const override; @@ -85,6 +87,7 @@ float mMotorCtlCurrent = 0; ///< Motor Controller Current float mPWMDutyCycle = 0; ///< PWM Duty Cycle in % quint32 mRotorCount = 0; ///< Rotor Count + quint32 mPresFlow = 0; ///< Prescribed flow rate }; MBloodFlow() { } @@ -95,4 +98,3 @@ } typedef Model:: MBloodFlow::Data BloodFlowData; - Index: sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r32ca8b84563394e35720ec2da6e607d45a128f39 --- sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp (.../MTreatmentDialysateFlowData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp (.../MTreatmentDialysateFlowData.cpp) (revision 32ca8b84563394e35720ec2da6e607d45a128f39) @@ -25,6 +25,8 @@ _data.mMotorCtlSpeed .value, _data.mMotorCtlCurrent.value, _data.mPWMDutyCycle .value, + _data.mRotorCount .value, + _data.mPresFlow .value, }; } @@ -37,6 +39,8 @@ if (GetValue(vByteArray, index, _data.mMotorCtlSpeed )) if (GetValue(vByteArray, index, _data.mMotorCtlCurrent )) if (GetValue(vByteArray, index, _data.mPWMDutyCycle )) + if (GetValue(vByteArray, index, _data.mRotorCount )) + if (GetValue(vByteArray, index, _data.mPresFlow )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -45,9 +49,10 @@ 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; } } - /*! * \brief MDialysateFlow::data * \details Provides model's Data from the received messages data values of @@ -63,5 +68,7 @@ data.mMotorCtlSpeed = _data.mMotorCtlSpeed .value; data.mMotorCtlCurrent = _data.mMotorCtlCurrent.value; data.mPWMDutyCycle = _data.mPWMDutyCycle .value; + data.mRotorCount = _data.mRotorCount .value; + data.mPresFlow = _data.mPresFlow .value; return data; } Index: sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r32ca8b84563394e35720ec2da6e607d45a128f39 --- sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h (.../MTreatmentDialysateFlowData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h (.../MTreatmentDialysateFlowData.h) (revision 32ca8b84563394e35720ec2da6e607d45a128f39) @@ -43,6 +43,8 @@ * | #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 | * * \sa Data * @@ -69,6 +71,8 @@ Types::F32 mMotorCtlSpeed ; ///< Motor Controller Speed Types::F32 mMotorCtlCurrent ; ///< Motor Controller Current Types::F32 mPWMDutyCycle ; ///< PWM Duty Cycle in % + Types::U32 mRotorCount ; ///< Rotor Count + Types::U32 mPresFlow ; ///< Prescribed flow rate } _data; public: @@ -84,6 +88,8 @@ float mMotorCtlSpeed = 0; ///< Motor Controller Speed float mMotorCtlCurrent = 0; ///< Motor Controller Current float mPWMDutyCycle = 0; ///< PWM Duty Cycle in % + quint32 mRotorCount = 0; ///< Rotor Count + quint32 mPresFlow = 0; ///< Prescribed flow rate }; MDialysateFlow() { } @@ -92,4 +98,5 @@ Data data() const; }; } + typedef Model::MDialysateFlow::Data DialysateFlowData; Index: sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r32ca8b84563394e35720ec2da6e607d45a128f39 --- sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp (.../VTreatmentBloodFlow.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp (.../VTreatmentBloodFlow.cpp) (revision 32ca8b84563394e35720ec2da6e607d45a128f39) @@ -29,4 +29,5 @@ bloodFlow_MotorCtlCurrent (vData.mMotorCtlCurrent ); bloodFlow_PWMDutyCycle (vData.mPWMDutyCycle ); bloodFlow_RotorCount (vData.mRotorCount ); + bloodFlow_PresFlow (vData.mPresFlow ); } Index: sources/view/hd/data/treatment/VTreatmentBloodFlow.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r32ca8b84563394e35720ec2da6e607d45a128f39 --- sources/view/hd/data/treatment/VTreatmentBloodFlow.h (.../VTreatmentBloodFlow.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/data/treatment/VTreatmentBloodFlow.h (.../VTreatmentBloodFlow.h) (revision 32ca8b84563394e35720ec2da6e607d45a128f39) @@ -44,6 +44,7 @@ PROPERTY( float , bloodFlow_MotorCtlCurrent, 0) PROPERTY( float , bloodFlow_PWMDutyCycle , 0) PROPERTY( quint32, bloodFlow_RotorCount , 0) + PROPERTY( quint32, bloodFlow_PresFlow , 0) VIEW_DEC(VTreatmentBloodFlow, BloodFlowData) }; Index: sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r32ca8b84563394e35720ec2da6e607d45a128f39 --- sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp (.../VTreatmentDialysateFlow.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp (.../VTreatmentDialysateFlow.cpp) (revision 32ca8b84563394e35720ec2da6e607d45a128f39) @@ -28,4 +28,6 @@ dialysateFlow_MotorCtlSpeed (vData.mMotorCtlSpeed ); dialysateFlow_MotorCtlCurrent (vData.mMotorCtlCurrent ); dialysateFlow_PWMDutyCycle (vData.mPWMDutyCycle ); + dialysateFlow_RotorCount (vData.mRotorCount ); + dialysateFlow_PresFlow (vData.mPresFlow ); } Index: sources/view/hd/data/treatment/VTreatmentDialysateFlow.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r32ca8b84563394e35720ec2da6e607d45a128f39 --- sources/view/hd/data/treatment/VTreatmentDialysateFlow.h (.../VTreatmentDialysateFlow.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/data/treatment/VTreatmentDialysateFlow.h (.../VTreatmentDialysateFlow.h) (revision 32ca8b84563394e35720ec2da6e607d45a128f39) @@ -43,6 +43,8 @@ PROPERTY( float , dialysateFlow_MotorCtlSpeed , 0) PROPERTY( float , dialysateFlow_MotorCtlCurrent, 0) PROPERTY( float , dialysateFlow_PWMDutyCycle , 0) + PROPERTY( quint32, dialysateFlow_RotorCount , 0) + PROPERTY( quint32, dialysateFlow_PresFlow , 0) VIEW_DEC(VTreatmentDialysateFlow, DialysateFlowData) };