Index: sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp =================================================================== diff -u -r988d4037838bb83205e1b98e1323846271e58571 -rf691de7d9e2076c8002c25e874d367fda30a09d5 --- sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp (.../MDuetRoWaterDG.cpp) (revision 988d4037838bb83205e1b98e1323846271e58571) +++ sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp (.../MDuetRoWaterDG.cpp) (revision f691de7d9e2076c8002c25e874d367fda30a09d5) @@ -37,17 +37,17 @@ QVariantList Model::MDuetRoWaterModeDGr::parameters() const { return { - _data.mFirmwareValue.value, _data.mAccepted .value, _data.mReason .value, + _data.mFirmwareValue.value, }; } bool Model::MDuetRoWaterModeDGr::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mFirmwareValue )) if (GetValue(vByteArray, index, _data.mAccepted )) if (GetValue(vByteArray, index, _data.mReason )) + if (GetValue(vByteArray, index, _data.mFirmwareValue )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -61,8 +61,8 @@ */ DuetRoWaterModeDGrData Model::MDuetRoWaterModeDGr::data() const { Data data; - data.mFirmwareValue = _data.mFirmwareValue.value; data.mAccepted = _data.mAccepted .value; data.mReason = _data.mReason .value; + data.mFirmwareValue = _data.mFirmwareValue.value; return data; }