Index: sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp =================================================================== diff -u -r70986eda0c1b55e62935f500014d0aa72f7262fe -r38ae7b93679d05a54fc460dac68891562d7da72d --- sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp (.../MDuetRoWaterDG.cpp) (revision 70986eda0c1b55e62935f500014d0aa72f7262fe) +++ sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp (.../MDuetRoWaterDG.cpp) (revision 38ae7b93679d05a54fc460dac68891562d7da72d) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2022-2023 Diality Inc. - All Rights Reserved. + * Copyright (c) 2023-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file MDuetRoWaterDG.cpp - * \author (last) Behrouz NematiPour - * \date (last) 22-Sep-2022 + * \author (last) Dara Navaei + * \date (last) 08-May-2024 * \author (original) Behrouz NematiPour - * \date (original) 22-Sep-2022 + * \date (original) 03-Apr-2023 * */ #include "MDuetRoWaterDG.h" @@ -37,18 +37,21 @@ QVariantList Model::MDuetRoWaterModeDGr::parameters() const { return { - _data.mAccepted.value, - _data.mReason .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.mAccepted )) - if (GetValue(vByteArray, index, _data.mReason )) + 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; } + 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.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mFirmwareValue = _data.mFirmwareValue.value; return data; }