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; }