Index: sources/model/dg/data/MDGROPumpData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r111520b86cdf85fca12c577ef492d8528c741044 --- sources/model/dg/data/MDGROPumpData.h (.../MDGROPumpData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/dg/data/MDGROPumpData.h (.../MDGROPumpData.h) (revision 111520b86cdf85fca12c577ef492d8528c741044) @@ -36,10 +36,12 @@ * * | Payload || * | || - * | #1:(F32) | \ref Data::mPressure | - * | #2:(F32) | \ref Data::mFlowRate | - * | #3:(F32) | \ref Data::mPWM | - * | #4:(U32) | \ref Data::mState | + * | #1:(F32) | \ref Data::mPressure | + * | #2:(F32) | \ref Data::mFlowRate | + * | #3:(F32) | \ref Data::mPWM | + * | #4:(U32) | \ref Data::mState | + * | #5:(F32) | \ref Data::mTgtFlowRate | + * | #6:(F32) | \ref Data::mFBPWM | * * \sa Data * @@ -59,10 +61,12 @@ QVariantList parameters() const override; struct { - Types::F32 mPressure ; - Types::F32 mFlowRate ; - Types::F32 mPWM ; - Types::U32 mState ; + Types::F32 mPressure ; + Types::F32 mFlowRate ; + Types::F32 mPWM ; + Types::U32 mState ; + Types::F32 mTgtFlowRate ; + Types::F32 mFBPWM ; } _data; public: @@ -72,10 +76,12 @@ QString infoText () const override { return QString("ROPump"); } struct Data { - float mPressure = 0; ///< Set pt. pressure - float mFlowRate = 0; ///< flow rate - float mPWM = 0; ///< PWM - quint32 mState = 0; ///< State + float mPressure = 0; ///< target pressure. + float mFlowRate = 0; ///< measured flow rate + float mPWM = 0; ///< duty cycle. + quint32 mState = 0; ///< current state. + float mTgtFlowRate = 0; ///< target flow rate in L/min. + float mFBPWM = 0; ///< feedback duty cycle. }; MDGROPump () { }