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