Index: sources/model/dg/data/MDGROPumpData.h =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/model/dg/data/MDGROPumpData.h (.../MDGROPumpData.h) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/model/dg/data/MDGROPumpData.h (.../MDGROPumpData.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -5,11 +5,11 @@ * 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 - * \author (last) Behrouz NematiPour - * \date (last) 16-Oct-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file MDGROPumpData.h + * \author (last) Behrouz NematiPour + * \date (last) 12-Feb-2021 + * \author (original) Behrouz NematiPour + * \date (original) 02-Jul-2020 * */ #pragma once @@ -36,9 +36,10 @@ * * | 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 | * * \sa Data * @@ -58,9 +59,10 @@ QVariantList parameters() const override; struct { - Types::U32 mPressure ; + Types::F32 mPressure ; Types::F32 mFlowRate ; Types::F32 mPWM ; + Types::U32 mState ; } _data; public: @@ -70,9 +72,10 @@ QString infoText () const override { return QString("ROPump"); } struct Data { - quint32 mPressure = 0; ///< Set pt. pressure + float mPressure = 0; ///< Set pt. pressure float mFlowRate = 0; ///< flow rate float mPWM = 0; ///< PWM + quint32 mState = 0; ///< State }; MDGROPump () { }