Index: sources/model/dg/data/MDDGenDialysateData.h =================================================================== diff -u -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 -r148e4803af29502875b08875f171e284398db34e --- sources/model/dg/data/MDDGenDialysateData.h (.../MDDGenDialysateData.h) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) +++ sources/model/dg/data/MDDGenDialysateData.h (.../MDDGenDialysateData.h) (revision 148e4803af29502875b08875f171e284398db34e) @@ -38,13 +38,12 @@ * | #01:(U32) | \ref Data::mGenDialysateExec | * | #02:(U32) | \ref Data::mDDInProgress | * | #03:(U32) | \ref Data::mFltLevel1 | - * | #04:(U32) | \ref Data::mFltLevel2 | - * | #05:(U32) | \ref Data::mBicarbLevel | - * | #06:(U32) | \ref Data::mSpentLevel | - * | #07:(F32) | \ref Data::mHydNegativePressure | - * | #08:(F32) | \ref Data::mHydPositivePressure | - * | #09:(F32) | \ref Data::mSpendPressure | - * | #10:(U32) | \ref Data::mDialGood | + * | #04:(U32) | \ref Data::mBicarbLevel | + * | #05:(U32) | \ref Data::mSpentLevel | + * | #06:(F32) | \ref Data::mHydNegativePressure | + * | #07:(F32) | \ref Data::mHydPositivePressure | + * | #08:(F32) | \ref Data::mSpendPressure | + * | #09:(U32) | \ref Data::mDialGood | * * * \sa Data @@ -68,7 +67,6 @@ Types::U32 mGenDialysateExec ; Types::U32 mDDInProgress ; Types::U32 mFltLevel1 ; - Types::U32 mFltLevel2 ; Types::U32 mBicarbLevel ; Types::U32 mSpentLevel ; Types::F32 mHydNegativePressure ; @@ -84,16 +82,15 @@ QString infoText () const override { return QString("Conductivity"); } struct Data{ - quint32 mGenDialysateExec = 0; ///< - quint32 mDDInProgress = 0; ///< - quint32 mFltLevel1 = 0; ///< - quint32 mFltLevel2 = 0; ///< - quint32 mBicarbLevel = 0; ///< - quint32 mSpentLevel = 0; ///< - float mHydNegativePressure = 0; ///< - float mHydPositivePressure = 0; ///< - float mSpendPressure = 0; ///< - quint32 mDialGood = 0; ///< + 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 mSpendPressure = 0; ///< Spent Dialysate positive pressure + quint32 mDialGood = 0; ///< Ready to deliver dialysate or not }; MDDGenDialysateData () { }