Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r4910e731017ba575e1f56c04dec0bf0589538f89 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 4910e731017ba575e1f56c04dec0bf0589538f89) @@ -107,6 +107,7 @@ // List of the transmit(request) only, messages which require acknowledge back(AckBack). QList _needsAcknow { + GuiActionType::ID_KeepAlive , // CONFIRM GuiActionType::ID_DuetConfirmUIr , // POST Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 -r4910e731017ba575e1f56c04dec0bf0589538f89 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 4910e731017ba575e1f56c04dec0bf0589538f89) @@ -73,7 +73,7 @@ {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_DialysateOutletFlow , 7 * 4 }, // 7 parameters each 4bytes + {Gui::GuiActionType::ID_DialysateOutletFlow , 10 * 4 }, //10 parameters each 4bytes {Gui::GuiActionType::ID_PressureOcclusion , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_Saline , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_Heparin , 2 * 4 }, // 2 parameters each 4bytes Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 -r4910e731017ba575e1f56c04dec0bf0589538f89 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 4910e731017ba575e1f56c04dec0bf0589538f89) @@ -248,8 +248,8 @@ DebugDataColumn { id: _HDAirColumn textObjectName :"_HDAirData" title : qsTr(" Air Status ") - x: col(3.0) - y: row(5.5) + x: col(3.7) + y: row(5.0) model: [ vHDAirBubble .venousAirBubbleStatus , vHDAirTrap .airTrapLowerLevel , @@ -339,6 +339,9 @@ vTreatmentUltrafiltration.ultrafiltration_MotorCtlSpeed .toFixed(2) , vTreatmentUltrafiltration.ultrafiltration_MotorCtlCurrent.toFixed(2) , "%" + vTreatmentUltrafiltration.ultrafiltration_PWMDtCycle .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_DopCorrOffset .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_DopCalcRate .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_UfCalcRate .toFixed(2) , ] label: [ "UFRef" , @@ -348,6 +351,9 @@ "MC.Spd" , "MC.Cur" , "PWM" , + "DopOfst" , + "DopRate" , + "UFcRate" , ] } Index: sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r4910e731017ba575e1f56c04dec0bf0589538f89 --- sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp (.../MTreatmentOutletFlowData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp (.../MTreatmentOutletFlowData.cpp) (revision 4910e731017ba575e1f56c04dec0bf0589538f89) @@ -24,7 +24,10 @@ _data.mMotorSpeed .value, _data.mMotorCtlSpeed .value, _data.mMotorCtlCurrent .value, - _data.mPWMDtCycle .value + _data.mPWMDtCycle .value, + _data.mDopCorrOffset .value, + _data.mDopCalcRate .value, + _data.mUfCalcRate .value, }; } @@ -37,6 +40,9 @@ if (GetValue(vByteArray, index, _data.mMotorCtlSpeed )) if (GetValue(vByteArray, index, _data.mMotorCtlCurrent )) if (GetValue(vByteArray, index, _data.mPWMDtCycle )) + if (GetValue(vByteArray, index, _data.mDopCorrOffset )) + if (GetValue(vByteArray, index, _data.mDopCalcRate )) + if (GetValue(vByteArray, index, _data.mUfCalcRate )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -45,6 +51,9 @@ 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; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -61,5 +70,8 @@ data.mMotorCtlSpeed = _data.mMotorCtlSpeed .value; data.mMotorCtlCurrent = _data.mMotorCtlCurrent.value; data.mPWMDtCycle = _data.mPWMDtCycle .value; + data.mDopCorrOffset = _data.mDopCorrOffset .value; + data.mDopCalcRate = _data.mDopCalcRate .value; + data.mUfCalcRate = _data.mUfCalcRate .value; return data; } Index: sources/model/hd/data/treatment/MTreatmentOutletFlowData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r4910e731017ba575e1f56c04dec0bf0589538f89 --- sources/model/hd/data/treatment/MTreatmentOutletFlowData.h (.../MTreatmentOutletFlowData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/data/treatment/MTreatmentOutletFlowData.h (.../MTreatmentOutletFlowData.h) (revision 4910e731017ba575e1f56c04dec0bf0589538f89) @@ -43,6 +43,9 @@ * | #5:(F32) | \ref Data::mMotorCtlSpeed | * | #6:(F32) | \ref Data::mMotorCtlCurrent | * | #7:(F32) | \ref Data::mPWMDtCycle | + * | # :(F32) | \ref Data::mDopCorrOffset | + * | # :(F32) | \ref Data::mDopCalcRate | + * | # :(F32) | \ref Data::mUfCalcRate | * * \sa Data * @@ -69,6 +72,9 @@ Types::F32 mMotorCtlSpeed ; Types::F32 mMotorCtlCurrent ; Types::F32 mPWMDtCycle ; + Types::F32 mDopCorrOffset ; + Types::F32 mDopCalcRate ; + Types::F32 mUfCalcRate ; } _data; public: @@ -85,6 +91,9 @@ float mMotorCtlSpeed = 0; ///< Motor Controller Speed float mMotorCtlCurrent = 0; ///< Motor Controller Current float mPWMDtCycle = 0; ///< PWM Duty Cycle in % + float mDopCorrOffset = 0; ///< + float mDopCalcRate = 0; ///< + float mUfCalcRate = 0; ///< }; MOutletFlow () { } Index: sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r4910e731017ba575e1f56c04dec0bf0589538f89 --- sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp (.../VTreatmentUltrafiltration.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp (.../VTreatmentUltrafiltration.cpp) (revision 4910e731017ba575e1f56c04dec0bf0589538f89) @@ -28,4 +28,7 @@ ultrafiltration_MotorCtlSpeed ( vData.mMotorCtlSpeed ); ultrafiltration_MotorCtlCurrent ( vData.mMotorCtlCurrent ); ultrafiltration_PWMDtCycle ( vData.mPWMDtCycle ); + ultrafiltration_DopCorrOffset ( vData.mDopCorrOffset ); + ultrafiltration_DopCalcRate ( vData.mDopCalcRate ); + ultrafiltration_UfCalcRate ( vData.mUfCalcRate ); } Index: sources/view/hd/data/treatment/VTreatmentUltrafiltration.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r4910e731017ba575e1f56c04dec0bf0589538f89 --- sources/view/hd/data/treatment/VTreatmentUltrafiltration.h (.../VTreatmentUltrafiltration.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/data/treatment/VTreatmentUltrafiltration.h (.../VTreatmentUltrafiltration.h) (revision 4910e731017ba575e1f56c04dec0bf0589538f89) @@ -48,6 +48,9 @@ PROPERTY( float, ultrafiltration_MotorCtlSpeed , 0) PROPERTY( float, ultrafiltration_MotorCtlCurrent, 0) PROPERTY( float, ultrafiltration_PWMDtCycle , 0) + PROPERTY( float, ultrafiltration_DopCorrOffset , 0) + PROPERTY( float, ultrafiltration_DopCalcRate , 0) + PROPERTY( float, ultrafiltration_UfCalcRate , 0) VIEW_DEC(VTreatmentUltrafiltration, OutletFlowData) };