Index: sources/model/td/data/MWaterSampleData.cpp =================================================================== diff -u -rca67f7413160dfba507856222bd9aa95c5fa6200 -r9403146058e7c4cef17bd542bbd39bbf032be9f3 --- sources/model/td/data/MWaterSampleData.cpp (.../MWaterSampleData.cpp) (revision ca67f7413160dfba507856222bd9aa95c5fa6200) +++ sources/model/td/data/MWaterSampleData.cpp (.../MWaterSampleData.cpp) (revision 9403146058e7c4cef17bd542bbd39bbf032be9f3) @@ -6,20 +6,20 @@ QVariantList MWaterSample::parameters() const { return { _data.mValve .value, - _data.mResult .value, + _data.mTimeout .value, }; } bool MWaterSample::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if ( ! GetValue(vByteArray, index, _data.mValve )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mResult )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mTimeout )) goto lError; return true ; - + lError: if(vIndex) { *vIndex = index; } - + return false ; } @@ -31,6 +31,6 @@ WaterSampleData MWaterSample::data() const { Data data; data.mValve = _data.mValve .value; - data.mResult = _data.mResult .value; + data.mTimeout = _data.mTimeout .value; return data; }