Index: sources/model/td/data/MTDValvesData.cpp =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r292beb22109065953f769ace13c3a395674612ac --- sources/model/td/data/MTDValvesData.cpp (.../MTDValvesData.cpp) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/data/MTDValvesData.cpp (.../MTDValvesData.cpp) (revision 292beb22109065953f769ace13c3a395674612ac) @@ -18,21 +18,31 @@ QVariantList MTDValvesData::parameters() const { return { - _data.mValveId .value, - _data.mState .value, - _data.mPosName .value, - _data.mPosCount .value, - _data.mNextPos .value, + _data.mValveId .value, + _data.mState .value, + _data.mCurrPosID .value, + _data.mCurrPos .value, + _data.mCmdPos .value, + _data.mPosA .value, + _data.mPosB .value, + _data.mPosC .value, + _data.mPosD .value, + _data.mMaxHomingPos .value, }; } bool MTDValvesData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; - if ( ! GetValue(vByteArray, index, _data.mValveId )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mState )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mPosName )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mPosCount )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mNextPos )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mValveId )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mState )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCurrPosID )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCurrPos )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCmdPos )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mPosA )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mPosB )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mPosC )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mPosD )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mMaxHomingPos )) goto lError; return true ; @@ -49,10 +59,15 @@ */ MTDValvesData::Data MTDValvesData::data() const{ Data data; - data.mValveId = _data.mValveId .value; - data.mState = _data.mState .value; - data.mPosName = _data.mPosName .value; - data.mPosCount = _data.mPosCount .value; - data.mNextPos = _data.mNextPos .value; + data.mValveId = _data.mValveId .value; + data.mState = _data.mState .value; + data.mCurrPosID = _data.mCurrPosID .value; + data.mCurrPos = _data.mCurrPos .value; + data.mCmdPos = _data.mCmdPos .value; + data.mPosA = _data.mPosA .value; + data.mPosB = _data.mPosB .value; + data.mPosC = _data.mPosC .value; + data.mPosD = _data.mPosD .value; + data.mMaxHomingPos = _data.mMaxHomingPos .value; return data; }