Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -r4910e731017ba575e1f56c04dec0bf0589538f89 -r111520b86cdf85fca12c577ef492d8528c741044 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 4910e731017ba575e1f56c04dec0bf0589538f89) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 111520b86cdf85fca12c577ef492d8528c741044) @@ -107,7 +107,8 @@ // List of the transmit(request) only, messages which require acknowledge back(AckBack). QList _needsAcknow { - GuiActionType::ID_KeepAlive , + // FIXME: check this on device first. It is not working with dialin. +// GuiActionType::ID_KeepAlive , // CONFIRM GuiActionType::ID_DuetConfirmUIr , // POST Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r83d5e3ad3f8179b925e7ed6b06e1dcd44bec71b1 -r111520b86cdf85fca12c577ef492d8528c741044 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 83d5e3ad3f8179b925e7ed6b06e1dcd44bec71b1) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 111520b86cdf85fca12c577ef492d8528c741044) @@ -91,7 +91,7 @@ {Gui::GuiActionType::ID_PostTreatmentStates , 2 * 4 }, // 2 parameter each 4bytes // DG Data Messages - {Gui::GuiActionType::ID_DGROPumpData , 4 * 4 }, // 4 parameters each 4bytes + {Gui::GuiActionType::ID_DGROPumpData , 6 * 4 }, // 6 parameters each 4bytes {Gui::GuiActionType::ID_DGPressuresData , 5 * 4 }, // 5 parameters each 4bytes {Gui::GuiActionType::ID_DGDrainPumpData , 7 * 4 }, // 7 parameters each 4bytes {Gui::GuiActionType::ID_DGOperationModeData , 2 * 4 }, // 2 parameter each 4bytes Index: sources/model/dg/data/MDGROPumpData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r111520b86cdf85fca12c577ef492d8528c741044 --- sources/model/dg/data/MDGROPumpData.cpp (.../MDGROPumpData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/dg/data/MDGROPumpData.cpp (.../MDGROPumpData.cpp) (revision 111520b86cdf85fca12c577ef492d8528c741044) @@ -8,7 +8,7 @@ * \file MDGROPumpData.cpp * \author (last) Behrouz NematiPour * \date (last) 12-Feb-2021 - * \author (original) Behrouz NemaiPour + * \author (original) Behrouz NematiPour * \date (original) 02-Jul-2020 * */ @@ -18,24 +18,30 @@ QVariantList MDGROPump::parameters() const { return { - _data.mPressure.value, - _data.mFlowRate.value, - _data.mPWM .value, - _data.mState .value + _data.mPressure .value, + _data.mFlowRate .value, + _data.mPWM .value, + _data.mState .value, + _data.mTgtFlowRate .value, + _data.mFBPWM .value, }; } bool MDGROPump::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mPressure)) - if (GetValue(vByteArray, index, _data.mFlowRate)) - if (GetValue(vByteArray, index, _data.mPWM )) - if (GetValue(vByteArray, index, _data.mState )) + if (GetValue(vByteArray, index, _data.mPressure )) + if (GetValue(vByteArray, index, _data.mFlowRate )) + if (GetValue(vByteArray, index, _data.mPWM )) + if (GetValue(vByteArray, index, _data.mState )) + if (GetValue(vByteArray, index, _data.mTgtFlowRate )) + if (GetValue(vByteArray, index, _data.mFBPWM )) 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; } } /*! @@ -45,9 +51,11 @@ */ MDGROPump::Data MDGROPump::data() const { Data data; - data.mPressure = _data.mPressure.value; - data.mFlowRate = _data.mFlowRate.value; - data.mPWM = _data.mPWM .value; - data.mState = _data.mState .value; + data.mPressure = _data.mPressure .value; + data.mFlowRate = _data.mFlowRate .value; + data.mPWM = _data.mPWM .value; + data.mState = _data.mState .value; + data.mTgtFlowRate = _data.mTgtFlowRate .value; + data.mFBPWM = _data.mFBPWM .value; return data; } 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 () { } Index: sources/view/dg/data/VDGROPumpData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r111520b86cdf85fca12c577ef492d8528c741044 --- sources/view/dg/data/VDGROPumpData.cpp (.../VDGROPumpData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/dg/data/VDGROPumpData.cpp (.../VDGROPumpData.cpp) (revision 111520b86cdf85fca12c577ef492d8528c741044) @@ -8,7 +8,7 @@ * \file VDGROPumpData.cpp * \author (last) Behrouz NematiPour * \date (last) 13-Feb-2021 - * \author (original) Behrouz NemaiPour + * \author (original) Behrouz NematiPour * \date (original) 02-Jul-2020 * */ @@ -21,8 +21,10 @@ void VDGROPump::onActionReceive(const DGROPumpData &vData) { - pressure ( vData.mPressure ); - flowRate ( vData.mFlowRate ); - pwm ( vData.mPWM ); - state ( vData.mState ); + pressure ( vData.mPressure ); + flowRate ( vData.mFlowRate ); + pwm ( vData.mPWM ); + state ( vData.mState ); + tgtFlowRate ( vData.mTgtFlowRate ); + fbPWM ( vData.mFBPWM ); } Index: sources/view/dg/data/VDGROPumpData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r111520b86cdf85fca12c577ef492d8528c741044 --- sources/view/dg/data/VDGROPumpData.h (.../VDGROPumpData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/dg/data/VDGROPumpData.h (.../VDGROPumpData.h) (revision 111520b86cdf85fca12c577ef492d8528c741044) @@ -36,10 +36,12 @@ { Q_OBJECT - PROPERTY( float , pressure , 0) - PROPERTY( float , flowRate , 0) - PROPERTY( float , pwm , 0) - PROPERTY( quint32 , state , 0) + PROPERTY( float , pressure , 0) + PROPERTY( float , flowRate , 0) + PROPERTY( float , pwm , 0) + PROPERTY( quint32 , state , 0) + PROPERTY( float , tgtFlowRate , 0) + PROPERTY( float , fbPWM , 0) VIEW_DEC(VDGROPump, DGROPumpData) };