Index: sources/model/dg/data/MDGROPumpData.cpp
===================================================================
diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/model/dg/data/MDGROPumpData.cpp	(.../MDGROPumpData.cpp)	(revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997)
+++ sources/model/dg/data/MDGROPumpData.cpp	(.../MDGROPumpData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2020-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 MDGROPumpData.cpp
- * \author (last) Behrouz NemaiPour
- * \date (last) 04-Jul-2020
- * \author (original) Behrouz NemaiPour
- * \date (original) 02-Jul-2020
+ * \file    MDGROPumpData.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      27-Mar-2023
+ * \author  (original)  Behrouz NemaiPour
+ * \date    (original)  02-Jul-2020
  *
  */
 #include "MDGROPumpData.h"
@@ -18,21 +18,30 @@
 
 QVariantList MDGROPump::parameters() const {
     return {
-        _data.mPressure.value,
-        _data.mFlowRate.value,
-        _data.mPWM     .value
+        _data.mPressure     .value,
+        _data.mFlowRate     .value,
+        _data.mPWM          .value,
+        _data.mState        .value,
+        _data.mTgtFlowRate  .value,
+        _data.mFBPWM        .value,
     };
 }
 
 bool MDGROPump::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mPressure))
-    if (GetValue(vByteArray, index, _data.mFlowRate))
-    if (GetValue(vByteArray, index, _data.mPWM     ))
-                            return true ;
+    if (GetValue(vByteArray, index, _data.mPressure     ))
+    if (GetValue(vByteArray, index, _data.mFlowRate     ))
+    if (GetValue(vByteArray, index, _data.mPWM          ))
+    if (GetValue(vByteArray, index, _data.mState        ))
+    if (GetValue(vByteArray, index, _data.mTgtFlowRate  ))
+    if (GetValue(vByteArray, index, _data.mFBPWM        ))
+        return true ;
     else { if(vIndex) *vIndex = index; return false; }
     else { if(vIndex) *vIndex = index; return false; }
     else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
 }
 
 /*!
@@ -42,8 +51,11 @@
  */
 MDGROPump::Data MDGROPump::data() const {
     Data data;
-    data.mPressure = _data.mPressure.value;
-    data.mFlowRate = _data.mFlowRate.value;
-    data.mPWM      = _data.mPWM     .value;
+    data.mPressure      = _data.mPressure       .value;
+    data.mFlowRate      = _data.mFlowRate       .value;
+    data.mPWM           = _data.mPWM            .value;
+    data.mState         = _data.mState          .value;
+    data.mTgtFlowRate   = _data.mTgtFlowRate    .value;
+    data.mFBPWM         = _data.mFBPWM          .value;
     return data;
 }