Index: sources/model/dg/data/MDGDrainPumpData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rf498a8439de814de93748f2f20315ce69900378e --- sources/model/dg/data/MDGDrainPumpData.cpp (.../MDGDrainPumpData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/dg/data/MDGDrainPumpData.cpp (.../MDGDrainPumpData.cpp) (revision f498a8439de814de93748f2f20315ce69900378e) @@ -18,24 +18,33 @@ QVariantList MDGDrainPump::parameters() const { return { - _data.mRPMI .value, - _data.mDAC .value, - _data.mState .value, - _data.mRPMO .value, + _data.mRPMI .value, + _data.mDAC .value, + _data.mState .value, + _data.mRPMO .value, + _data.mTargetFLPMO .value, + _data.mCurrentA .value, + _data.mDirection .value, }; } bool MDGDrainPump::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mRPMI )) - if (GetValue(vByteArray, index, _data.mDAC )) - if (GetValue(vByteArray, index, _data.mState )) - if (GetValue(vByteArray, index, _data.mRPMO )) + if (GetValue(vByteArray, index, _data.mRPMI )) + if (GetValue(vByteArray, index, _data.mDAC )) + if (GetValue(vByteArray, index, _data.mState )) + if (GetValue(vByteArray, index, _data.mRPMO )) + if (GetValue(vByteArray, index, _data.mTargetFLPMO )) + if (GetValue(vByteArray, index, _data.mCurrentA )) + if (GetValue(vByteArray, index, _data.mDirection )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -45,9 +54,12 @@ */ MDGDrainPump::Data MDGDrainPump::data() const { Data data; - data.mRPMI = _data.mRPMI .value; - data.mDAC = _data.mDAC .value; - data.mState = _data.mState .value; - data.mRPMO = _data.mRPMO .value; + data.mRPMI = _data.mRPMI .value; + data.mDAC = _data.mDAC .value; + data.mState = _data.mState .value; + data.mRPMO = _data.mRPMO .value; + data.mTargetFLPMO = _data.mTargetFLPMO .value; + data.mCurrentA = _data.mCurrentA .value; + data.mDirection = _data.mDirection .value; return data; } Index: sources/model/dg/data/MDGDrainPumpData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rf498a8439de814de93748f2f20315ce69900378e --- sources/model/dg/data/MDGDrainPumpData.h (.../MDGDrainPumpData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/dg/data/MDGDrainPumpData.h (.../MDGDrainPumpData.h) (revision f498a8439de814de93748f2f20315ce69900378e) @@ -36,11 +36,15 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mRPMI | - * | #2:(U32) | \ref Data::mDAC | - * | #3:(U32) | \ref Data::mState | - * | #4:(U32) | \ref Data::mPRMO | + * | #1:(U32) | \ref Data::mRPMI | + * | #2:(U32) | \ref Data::mDAC | + * | #3:(U32) | \ref Data::mState | + * | #4:(U32) | \ref Data::mPRMO | + * | #5:(F32) | \ref Data::mTargetFLPMO | + * | #6:(F32) | \ref Data::mCurrentA | + * | #7:(U32) | \ref Data::mDirection | * + * * \sa Data * *

Logging info

@@ -59,10 +63,13 @@ QVariantList parameters() const override; struct { - Types::U32 mRPMI ; - Types::U32 mDAC ; - Types::U32 mState ; - Types::U32 mRPMO ; + Types::U32 mRPMI ; + Types::U32 mDAC ; + Types::U32 mState ; + Types::U32 mRPMO ; + Types::F32 mTargetFLPMO ; + Types::F32 mCurrentA ; + Types::U32 mDirection ; } _data; public: @@ -72,10 +79,13 @@ QString infoText () const override { return QString("DrainPump"); } struct Data { - quint32 mRPMI = 0; ///< Set pt. RPM - quint32 mDAC = 0; ///< DAC value - quint32 mState = 0; ///< State - quint32 mRPMO = 0; ///< RPM read + quint32 mRPMI = 0; ///< Set pt. RPM + quint32 mDAC = 0; ///< DAC value + quint32 mState = 0; ///< State + quint32 mRPMO = 0; ///< RPM read + float mTargetFLPMO = 0; ///< target Outlet Flow LPM + float mCurrentA = 0; ///< drain Pump Current A + quint32 mDirection = 0; ///< drain Pump Direction }; MDGDrainPump () { } Index: sources/view/dg/data/VDGDrainPumpData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rf498a8439de814de93748f2f20315ce69900378e --- sources/view/dg/data/VDGDrainPumpData.cpp (.../VDGDrainPumpData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/dg/data/VDGDrainPumpData.cpp (.../VDGDrainPumpData.cpp) (revision f498a8439de814de93748f2f20315ce69900378e) @@ -21,8 +21,11 @@ void VDGDrainPump::onActionReceive(const DGDrainPumpData &vData) { - rpmi ( vData.mRPMI ); - dac ( vData.mDAC ); - state ( vData.mState ); - rpmo ( vData.mRPMO ); + rpmi ( vData.mRPMI ); + dac ( vData.mDAC ); + state ( vData.mState ); + rpmo ( vData.mRPMO ); + targetFLPMO ( vData.mTargetFLPMO ); + currentA ( vData.mCurrentA ); + direction ( vData.mDirection ); } Index: sources/view/dg/data/VDGDrainPumpData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rf498a8439de814de93748f2f20315ce69900378e --- sources/view/dg/data/VDGDrainPumpData.h (.../VDGDrainPumpData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/dg/data/VDGDrainPumpData.h (.../VDGDrainPumpData.h) (revision f498a8439de814de93748f2f20315ce69900378e) @@ -36,10 +36,13 @@ { Q_OBJECT - PROPERTY( quint32 , rpmi , 0) - PROPERTY( quint32 , dac , 0) - PROPERTY( quint32 , state , 0) - PROPERTY( quint32 , rpmo , 0) + PROPERTY( quint32 , rpmi , 0) + PROPERTY( quint32 , dac , 0) + PROPERTY( quint32 , state , 0) + PROPERTY( quint32 , rpmo , 0) + PROPERTY( float , targetFLPMO , 0) + PROPERTY( float , currentA , 0) + PROPERTY( quint32 , direction , 0) VIEW_DEC(VDGDrainPump, DGDrainPumpData) };