Index: sources/model/td/data/MTDAirPumpData.cpp =================================================================== diff -u -r3c07dc803109f716937b692cb4a67a5324bb9ca3 -r291906e7a62816a10cb424389df9ac3704aa8dc3 --- sources/model/td/data/MTDAirPumpData.cpp (.../MTDAirPumpData.cpp) (revision 3c07dc803109f716937b692cb4a67a5324bb9ca3) +++ sources/model/td/data/MTDAirPumpData.cpp (.../MTDAirPumpData.cpp) (revision 291906e7a62816a10cb424389df9ac3704aa8dc3) @@ -18,15 +18,21 @@ QVariantList MTDAirPumpData::parameters() const { return { - _data.h12State .value, - _data.h12Power .value, + _data.mH12State .value, + _data.mH12RPM .value, + _data.mH12Power .value, + _data.mFPGAH12RPM .value, + _data.mScalarPower .value, }; } bool MTDAirPumpData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; - if ( ! GetValue(vByteArray, index, _data.h12State )) goto lError; - if ( ! GetValue(vByteArray, index, _data.h12Power )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH12State )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH12RPM )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH12Power )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mFPGAH12RPM )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mScalarPower )) goto lError; return true ; @@ -43,7 +49,10 @@ */ MTDAirPumpData::Data MTDAirPumpData::data() const{ Data data; - data.mAirPumpState = _data.h12State .value; - data.mAirPumpPower = _data.h12Power .value; + data.mState = _data.mH12State .value; + data.mRPM = _data.mH12RPM .value; + data.mPower = _data.mH12Power .value; + data.mFPGARPM = _data.mFPGAH12RPM .value; + data.mScalarPower = _data.mScalarPower .value; return data; }