Index: sources/model/dg/data/MDGDrainPumpData.cpp =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/model/dg/data/MDGDrainPumpData.cpp (.../MDGDrainPumpData.cpp) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/model/dg/data/MDGDrainPumpData.cpp (.../MDGDrainPumpData.cpp) (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 MDGDrainPumpData.cpp - * \author (last) Behrouz NematiPour - * \date (last) 16-Oct-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file MDGDrainPumpData.cpp + * \author (last) Behrouz NematiPour + * \date (last) 12-Feb-2021 + * \author (original) Behrouz NematiPour + * \date (original) 02-Jul-2020 * */ #include "MDGDrainPumpData.h" @@ -18,18 +18,24 @@ QVariantList MDGDrainPump::parameters() const { return { - _data.mRPM .value, - _data.mDAC .value + _data.mRPMI .value, + _data.mDAC .value, + _data.mState .value, + _data.mRPMO .value, }; } bool MDGDrainPump::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mRPM )) - if (GetValue(vByteArray, index, _data.mDAC )) + if (GetValue(vByteArray, index, _data.mRPMI )) + if (GetValue(vByteArray, index, _data.mDAC )) + if (GetValue(vByteArray, index, _data.mState )) + if (GetValue(vByteArray, index, _data.mRPMO )) 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; } } /*! @@ -39,7 +45,9 @@ */ MDGDrainPump::Data MDGDrainPump::data() const { Data data; - data.mRPM = _data.mRPM .value; - data.mDAC = _data.mDAC .value; + data.mRPMI = _data.mRPMI .value; + data.mDAC = _data.mDAC .value; + data.mState = _data.mState .value; + data.mRPMO = _data.mRPMO .value; return data; }