Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r5504ac8191553be2580700b4a010426a58d71fd4 -rc82f27ac6f0c015db70c66272f9b67e62b2f83fd --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 5504ac8191553be2580700b4a010426a58d71fd4) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision c82f27ac6f0c015db70c66272f9b67e62b2f83fd) @@ -111,7 +111,7 @@ {Gui::GuiActionType::ID_DDDialysatePumpData , 20 * 4 }, // 20 parameters each 4bytes {Gui::GuiActionType::ID_DDHeatersData , 8 * 4 }, // 8 parameters each 4bytes // NOTE: may contain optional 9 parameters each 4bytes {Gui::GuiActionType::ID_DDLevelData , 3 * 4 }, // 3 parameters each 4bytes - {Gui::GuiActionType::ID_DDGenDialysateData , 9 * 4 }, // 9 parameters each 4bytes + {Gui::GuiActionType::ID_DDGenDialysateData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_DDBloodLeakData , 1 * 4 }, // 1 parameters each 4bytes //FP Data Messages {Gui::GuiActionType::ID_FPROPumpData , 9 * 4 }, // 9 parameters each 4bytes Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml =================================================================== diff -u -r91c381afa3a5a01579d47a603600f1a56c8ab5b6 -rc82f27ac6f0c015db70c66272f9b67e62b2f83fd --- sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 91c381afa3a5a01579d47a603600f1a56c8ab5b6) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision c82f27ac6f0c015db70c66272f9b67e62b2f83fd) @@ -294,23 +294,13 @@ vDDGenDialysate.genDialysateExec , vDDGenDialysate.ddInProgress , vDDGenDialysate.isDialGood , - vDDGenDialysate.fltLevel1 , - vDDGenDialysate.bicarbLevel , - vDDGenDialysate.spentLevel , - vDDGenDialysate.hydNegativePressure .toFixed(2), - vDDGenDialysate.hydPositivePressure .toFixed(2), - vDDGenDialysate.spentPressure .toFixed(2), + vDDGenDialysate.currentQd .toFixed(2) , ] label: [ "Exec ", "inProg ", "isGood ", - "fltLvL (D6) ", - "bicarbLvL (D63)", - "sptLvL (D46) ", - "hydNeg (D19) ", - "hydPos (D18) ", - "sptPres (D51) ", + "current Qd ", ] } Index: sources/model/dd/data/MDDGenDialysateData.cpp =================================================================== diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -rc82f27ac6f0c015db70c66272f9b67e62b2f83fd --- sources/model/dd/data/MDDGenDialysateData.cpp (.../MDDGenDialysateData.cpp) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) +++ sources/model/dd/data/MDDGenDialysateData.cpp (.../MDDGenDialysateData.cpp) (revision c82f27ac6f0c015db70c66272f9b67e62b2f83fd) @@ -19,27 +19,17 @@ return { _data.mGenDialysateExec .value, _data.mDDInProgress .value, - _data.mD6Level .value, - _data.mD63Level .value, - _data.mD46Level .value, - _data.mD9Pressure .value, - _data.mD18Pressure .value, - _data.mD51Pressure .value, _data.mIsDialGood .value, + _data.mCurrentQd .value, }; } bool MDDGenDialysateData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if ( ! GetValue(vByteArray, index, _data.mGenDialysateExec )) goto lError; if ( ! GetValue(vByteArray, index, _data.mDDInProgress )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mD6Level )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mD63Level )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mD46Level )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mD9Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mD18Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mD51Pressure )) goto lError; if ( ! GetValue(vByteArray, index, _data.mIsDialGood )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCurrentQd )) goto lError; return true ; @@ -58,12 +48,7 @@ Data data; data.mGenDialysateExec = _data.mGenDialysateExec .value; data.mDDInProgress = _data.mDDInProgress .value; - data.mFltLevel1 = _data.mD6Level .value; - data.mBicarbLevel = _data.mD63Level .value; - data.mSpentLevel = _data.mD46Level .value; - data.mHydNegativePressure = _data.mD9Pressure .value; - data.mHydPositivePressure = _data.mD18Pressure .value; - data.mSpentPressure = _data.mD51Pressure .value; data.mIsDialGood = _data.mIsDialGood .value; + data.mCurrentQd = _data.mCurrentQd .value; return data; } Index: sources/model/dd/data/MDDGenDialysateData.h =================================================================== diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -rc82f27ac6f0c015db70c66272f9b67e62b2f83fd --- sources/model/dd/data/MDDGenDialysateData.h (.../MDDGenDialysateData.h) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) +++ sources/model/dd/data/MDDGenDialysateData.h (.../MDDGenDialysateData.h) (revision c82f27ac6f0c015db70c66272f9b67e62b2f83fd) @@ -37,13 +37,8 @@ * | || * | #01:(U32) | \ref Data::mGenDialysateExec | * | #02:(U32) | \ref Data::mDDInProgress | - * | #03:(U32) | \ref Data::mFltLevel1 | - * | #04:(U32) | \ref Data::mBicarbLevel | - * | #05:(U32) | \ref Data::mSpentLevel | - * | #06:(F32) | \ref Data::mHydNegativePressure | - * | #07:(F32) | \ref Data::mHydPositivePressure | - * | #08:(F32) | \ref Data::mSpentPressure | - * | #09:(U32) | \ref Data::mIsDialGood | + * | #03:(U32) | \ref Data::mIsDialGood | + * | #04:(F32) | \ref Data::mCurrentQd | * * * \sa Data @@ -66,14 +61,8 @@ struct { Types::U32 mGenDialysateExec ; Types::U32 mDDInProgress ; - Types::U32 mD6Level ; - Types::U32 mD63Level ; - Types::U32 mD46Level ; - Types::F32 mD9Pressure ; - Types::F32 mD18Pressure ; - Types::F32 mD51Pressure ; Types::U32 mIsDialGood ; - + Types::F32 mCurrentQd ; } _data; public: @@ -84,13 +73,8 @@ struct Data{ quint32 mGenDialysateExec = 0; ///< Generate dialysate execution state quint32 mDDInProgress = 0; ///< Dialysate Delivery in Progress Bool - quint32 mFltLevel1 = 0; ///< Floater level (low, medium and high) - quint32 mBicarbLevel = 0; ///< BiCarb Chamber level - quint32 mSpentLevel = 0; ///< Spent dialysate chamber level - float mHydNegativePressure = 0; ///< Hydraulics chamber negative pressure - float mHydPositivePressure = 0; ///< Hydraulics chamber positive pressure - float mSpentPressure = 0; ///< Spent Dialysate positive pressure quint32 mIsDialGood = 0; ///< Ready to deliver dialysate or not + float mCurrentQd = 0; ///< Current dialysate flow rate (ml/min) }; MDDGenDialysateData () { } Index: sources/view/dd/data/VDDGenDialysateData.cpp =================================================================== diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -rc82f27ac6f0c015db70c66272f9b67e62b2f83fd --- sources/view/dd/data/VDDGenDialysateData.cpp (.../VDDGenDialysateData.cpp) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) +++ sources/view/dd/data/VDDGenDialysateData.cpp (.../VDDGenDialysateData.cpp) (revision c82f27ac6f0c015db70c66272f9b67e62b2f83fd) @@ -23,11 +23,6 @@ { genDialysateExec ( vData. mGenDialysateExec ); ddInProgress ( vData. mDDInProgress ); - fltLevel1 ( vData. mFltLevel1 ); - bicarbLevel ( vData. mBicarbLevel ); - spentLevel ( vData. mSpentLevel ); - hydNegativePressure ( vData. mHydNegativePressure ); - hydPositivePressure ( vData. mHydPositivePressure ); - spentPressure ( vData. mSpentPressure ); isDialGood ( vData. mIsDialGood ); + currentQd ( vData. mCurrentQd ); } Index: sources/view/dd/data/VDDGenDialysateData.h =================================================================== diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -rc82f27ac6f0c015db70c66272f9b67e62b2f83fd --- sources/view/dd/data/VDDGenDialysateData.h (.../VDDGenDialysateData.h) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) +++ sources/view/dd/data/VDDGenDialysateData.h (.../VDDGenDialysateData.h) (revision c82f27ac6f0c015db70c66272f9b67e62b2f83fd) @@ -37,13 +37,8 @@ PROPERTY( quint32 , genDialysateExec , 0) PROPERTY( quint32 , ddInProgress , 0) - PROPERTY( quint32 , fltLevel1 , 0) - PROPERTY( quint32 , bicarbLevel , 0) - PROPERTY( quint32 , spentLevel , 0) - PROPERTY( float , hydNegativePressure , 0) - PROPERTY( float , hydPositivePressure , 0) - PROPERTY( float , spentPressure , 0) PROPERTY( quint32 , isDialGood , 0) + PROPERTY( float , currentQd , 0) VIEW_DEC(VDDGenDialysate, DDGenDialysateData) };