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;
 }
Index: sources/model/dg/adjustment/settings/MDuetRoWaterDG.h
===================================================================
diff -u -r988d4037838bb83205e1b98e1323846271e58571 -rf691de7d9e2076c8002c25e874d367fda30a09d5
--- sources/model/dg/adjustment/settings/MDuetRoWaterDG.h	(.../MDuetRoWaterDG.h)	(revision 988d4037838bb83205e1b98e1323846271e58571)
+++ sources/model/dg/adjustment/settings/MDuetRoWaterDG.h	(.../MDuetRoWaterDG.h)	(revision f691de7d9e2076c8002c25e874d367fda30a09d5)
@@ -82,9 +82,9 @@
  *
  * | Payload  ||
  * |          ||
- * | #1:(U32) | \ref Data::mFWValue  |
- * | #2:(U32) | \ref Data::mAccepted |
- * | #3:(U32) | \ref Data::mReason   |
+ * | #1:(U32) | \ref Data::mAccepted |
+ * | #2:(U32) | \ref Data::mReason   |
+ * | #3:(U32) | \ref Data::mFWValue  |
  *
  * \sa Data
  *
@@ -104,9 +104,9 @@
     QVariantList parameters() const override;
 
     struct {
-        Types::U32 mFirmwareValue;
         Types::U32 mAccepted     ;
         Types::U32 mReason       ;
+        Types::U32 mFirmwareValue;
     } _data;
 
 public:
@@ -115,9 +115,9 @@
     QString      infoText   () const override { return QString("AdjustRoWater") ; }
 
     struct Data {
-        quint32    mFirmwareValue = 0;  /*!< Value in the firmware */
         bool       mAccepted      = 0;  /*!< Accepted        value of type quint32 extracted out */
         quint32    mReason        = 0;  /*!< Reason          value of type quint32 extracted out */
+        quint32    mFirmwareValue = 0;  /*!< Value in the firmware */
     };
 
     MDuetRoWaterModeDGr () { }
Index: sources/view/settings/VDuetRoWaterDG.cpp
===================================================================
diff -u -r988d4037838bb83205e1b98e1323846271e58571 -rf691de7d9e2076c8002c25e874d367fda30a09d5
--- sources/view/settings/VDuetRoWaterDG.cpp	(.../VDuetRoWaterDG.cpp)	(revision 988d4037838bb83205e1b98e1323846271e58571)
+++ sources/view/settings/VDuetRoWaterDG.cpp	(.../VDuetRoWaterDG.cpp)	(revision f691de7d9e2076c8002c25e874d367fda30a09d5)
@@ -44,9 +44,9 @@
 
 void View::VDuetRoWaterDG::onActionReceive(const DuetRoWaterModeDGrData &vData) // 0xC400 : 196
 {
-    adjustment_FWValue          ( vData.mFirmwareValue );
     adjustment_Accepted         ( vData.mAccepted      );
     adjustment_Reason           ( vData.mReason        );
+    adjustment_FWValue          ( vData.mFirmwareValue );
 
     if (vData.mAccepted) {
         status( _data.mStatus );    // apply the request