Index: sources/model/dg/data/MDGDrainPumpData.cpp =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -r26433c42f2efa2cb18af95f523581c7eeeff049d --- sources/model/dg/data/MDGDrainPumpData.cpp (.../MDGDrainPumpData.cpp) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/dg/data/MDGDrainPumpData.cpp (.../MDGDrainPumpData.cpp) (revision 26433c42f2efa2cb18af95f523581c7eeeff049d) @@ -1,15 +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 MDGDrainPumpData.cpp - * \author (last) Behrouz NemaiPour - * \date (last) 04-Jul-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file MDGDrainPumpData.cpp + * \author (last) Dara Navaei + * \date (last) 05-Mar-2024 + * \author (original) Behrouz NemaiPour + * \date (original) 02-Jul-2020 * */ #include "MDGDrainPumpData.h" @@ -18,18 +18,36 @@ QVariantList MDGDrainPump::parameters() const { return { - _data.mRPM .value, - _data.mDAC .value + _data.mRPMI .value, + _data.mDAC .value, + _data.mState .value, + _data.mRPMO .value, + _data.mTargetFLPMO .value, + _data.mCurrentA .value, + _data.mDirection .value, + _data.mMaxonRPM .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 )) + if (GetValue(vByteArray, index, _data.mTargetFLPMO )) + if (GetValue(vByteArray, index, _data.mCurrentA )) + if (GetValue(vByteArray, index, _data.mDirection )) + if (GetValue(vByteArray, index, _data.mMaxonRPM )) 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; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -39,7 +57,13 @@ */ 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; + data.mTargetFLPMO = _data.mTargetFLPMO .value; + data.mCurrentA = _data.mCurrentA .value; + data.mDirection = _data.mDirection .value; + data.mMaxonRPM = _data.mMaxonRPM .value; return data; }