Index: sources/view/settings/VDuetRoWaterDG.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r22b7b49b9e973ea560eee30ecb48aa982555bf54 --- sources/view/settings/VDuetRoWaterDG.cpp (.../VDuetRoWaterDG.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/settings/VDuetRoWaterDG.cpp (.../VDuetRoWaterDG.cpp) (revision 22b7b49b9e973ea560eee30ecb48aa982555bf54) @@ -38,27 +38,22 @@ void View::VDuetRoWaterDG::onActionReceive(const DuetRoWaterStatDGqData & ) // 0xC300 : 195 { - _post = true; doAdjustment( _status ); } void View::VDuetRoWaterDG::onActionReceive(const DuetRoWaterModeDGrData &vData) // 0xC400 : 196 { adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); + adjustment_FWValue ( vData.mFirmwareValue ); + // Accept the value that has been sent + status( vData.mFirmwareValue ); + if (vData.mAccepted) { - status( _data.mStatus ); // apply the request notification(""); } else { - if ( _post ) { - status( ! _status ); // on post what UI currently has, is rejected, so UI should change to opposite. - _post = false; - } - else { - status( _status ); // use the old value to emit signal for UI - } notification(tr("The RO Water Mode change request has been rejected [%1]").arg(vData.mReason)); } @@ -81,7 +76,6 @@ */ void View::VDuetRoWaterDG::onActionReceive(const SettingsData &) { - _post = true; QString mCategory = Storage::Settings_Category_SettingsSystem; FROMVARIANT( status, "RoWaterMode", "RoWaterMode", UInt ); }