Index: sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp =================================================================== diff -u -r482949dd876ebec823e955670b3d9f3834e9c215 -r22b7b49b9e973ea560eee30ecb48aa982555bf54 --- sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp (.../MTreatmentBloodFlowData.cpp) (revision 482949dd876ebec823e955670b3d9f3834e9c215) +++ sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp (.../MTreatmentBloodFlowData.cpp) (revision 22b7b49b9e973ea560eee30ecb48aa982555bf54) @@ -73,5 +73,6 @@ data.mPWMDutyCycle = _data.mPWMDutyCycle .value; data.mRotorCount = _data.mRotorCount .value; data.mPresFlow = _data.mPresFlow .value; + data.mRotorHall = _data.mRotorHall .value; return data; } Index: sources/view/VAdjustmentResponseBase.h =================================================================== diff -u -r988d4037838bb83205e1b98e1323846271e58571 -r22b7b49b9e973ea560eee30ecb48aa982555bf54 --- sources/view/VAdjustmentResponseBase.h (.../VAdjustmentResponseBase.h) (revision 988d4037838bb83205e1b98e1323846271e58571) +++ sources/view/VAdjustmentResponseBase.h (.../VAdjustmentResponseBase.h) (revision 22b7b49b9e973ea560eee30ecb48aa982555bf54) @@ -57,7 +57,6 @@ // disabled coco end PROPERTY( bool , adjustment_Accepted , 0) - PROPERTY( quint32 , adjustment_FWValue , 0) Q_PROPERTY(QString adjustment_ReasonText READ text NOTIFY adjustment_ReasonTriggered) Index: sources/view/settings/VDuetRoWaterDG.cpp =================================================================== diff -u -rf691de7d9e2076c8002c25e874d367fda30a09d5 -r22b7b49b9e973ea560eee30ecb48aa982555bf54 --- sources/view/settings/VDuetRoWaterDG.cpp (.../VDuetRoWaterDG.cpp) (revision f691de7d9e2076c8002c25e874d367fda30a09d5) +++ sources/view/settings/VDuetRoWaterDG.cpp (.../VDuetRoWaterDG.cpp) (revision 22b7b49b9e973ea560eee30ecb48aa982555bf54) @@ -38,7 +38,6 @@ void View::VDuetRoWaterDG::onActionReceive(const DuetRoWaterStatDGqData & ) // 0xC300 : 195 { - _post = true; doAdjustment( _status ); } @@ -48,16 +47,13 @@ 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 the firmware rejected the set RO only mode, set the value that firmware has it. - status( vData.mFirmwareValue ); - if ( _post ) { - _post = false; - } notification(tr("The RO Water Mode change request has been rejected [%1]").arg(vData.mReason)); } @@ -80,7 +76,6 @@ */ void View::VDuetRoWaterDG::onActionReceive(const SettingsData &) { - _post = true; QString mCategory = Storage::Settings_Category_SettingsSystem; FROMVARIANT( status, "RoWaterMode", "RoWaterMode", UInt ); } Index: sources/view/settings/VDuetRoWaterDG.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r22b7b49b9e973ea560eee30ecb48aa982555bf54 --- sources/view/settings/VDuetRoWaterDG.h (.../VDuetRoWaterDG.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/settings/VDuetRoWaterDG.h (.../VDuetRoWaterDG.h) (revision 22b7b49b9e973ea560eee30ecb48aa982555bf54) @@ -76,15 +76,15 @@ Q_OBJECT DuetRoWaterModeUIiData _data; - bool _post = true; // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI // has been manually tested that it works perfectly fine - TRIGGER ( bool , adjustment , 0) + TRIGGER ( bool , adjustment , 0) - TRIGGER ( bool , status , 0) - PROPERTY( QString , notification ,"") + TRIGGER ( bool , status , 0) + PROPERTY( QString , notification ,"") + PROPERTY( quint32 , adjustment_FWValue , 0) VIEW_DEC_CLASS(VDuetRoWaterDG) VIEW_DEC_SLOT(DuetRoWaterStatDGqData)