Index: sources/model/dg/data/MDGROPumpData.h =================================================================== diff -u -r4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/model/dg/data/MDGROPumpData.h (.../MDGROPumpData.h) (revision 4d969a04e6d80a6d2f6b756a4b87aecd6356e6a9) +++ sources/model/dg/data/MDGROPumpData.h (.../MDGROPumpData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,13 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file MDGROPumpData.h - * \date 7/1/2020 - * \author Behrouz NematiPour + * \author (last) Behrouz NematiPour + * \date (last) 27-Mar-2023 + * \author (original) Behrouz NemaiPour + * \date (original) 02-Jul-2020 * */ #pragma once @@ -34,9 +36,12 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mPressure| - * | #2:(F32) | \ref Data::mFlowRate| - * | #3:(F32) | \ref Data::mPWM | + * | #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 * @@ -56,9 +61,12 @@ QVariantList parameters() const override; struct { - Types::U32 mPressure ; - Types::F32 mFlowRate ; - Types::F32 mPWM ; + Types::F32 mPressure ; + Types::F32 mFlowRate ; + Types::F32 mPWM ; + Types::U32 mState ; + Types::F32 mTgtFlowRate ; + Types::F32 mFBPWM ; } _data; public: @@ -68,9 +76,12 @@ QString infoText () const override { return QString("ROPump"); } struct Data { - quint32 mPressure = 0; ///< Set pt. pressure - float mFlowRate = 0; ///< flow rate - float mPWM = 0; ///< PWM + 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 () { }