Index: sources/model/dg/data/MDGROPumpData.cpp =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/model/dg/data/MDGROPumpData.cpp (.../MDGROPumpData.cpp) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/model/dg/data/MDGROPumpData.cpp (.../MDGROPumpData.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 MDGROPumpData.cpp - * \author (last) Behrouz NematiPour - * \date (last) 16-Oct-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file MDGROPumpData.cpp + * \author (last) Behrouz NematiPour + * \date (last) 12-Feb-2021 + * \author (original) Behrouz NematiPour + * \date (original) 02-Jul-2020 * */ #include "MDGROPumpData.h" @@ -20,7 +20,8 @@ return { _data.mPressure.value, _data.mFlowRate.value, - _data.mPWM .value + _data.mPWM .value, + _data.mState .value }; } @@ -29,10 +30,12 @@ if (GetValue(vByteArray, index, _data.mPressure)) if (GetValue(vByteArray, index, _data.mFlowRate)) if (GetValue(vByteArray, index, _data.mPWM )) - return true ; + if (GetValue(vByteArray, index, _data.mState )) + 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; } } /*! @@ -45,5 +48,6 @@ data.mPressure = _data.mPressure.value; data.mFlowRate = _data.mFlowRate.value; data.mPWM = _data.mPWM .value; + data.mState = _data.mState .value; return data; }