Index: sources/model/hd/data/MTreatmentStatesData.cpp
===================================================================
diff -u -rf7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53 -r58014dae52ee6357e88b9b03bcad457ddcb432e8
--- sources/model/hd/data/MTreatmentStatesData.cpp	(.../MTreatmentStatesData.cpp)	(revision f7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53)
+++ sources/model/hd/data/MTreatmentStatesData.cpp	(.../MTreatmentStatesData.cpp)	(revision 58014dae52ee6357e88b9b03bcad457ddcb432e8)
@@ -5,11 +5,11 @@
  * 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 MTreatmentStatesData.cpp
- * \author (last) Behrouz NematiPour
- * \date (last) 16-Oct-2020
- * \author (original) Behrouz NemaiPour
- * \date (original) 02-Jul-2020
+ * \file    MTreatmentStatesData.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      07-Feb-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  02-Jul-2020
  *
  */
 #include "MTreatmentStatesData.h"
@@ -18,24 +18,30 @@
 
 QVariantList MTreatmentStates::parameters() const {
     return {
-        _data.mSubMode     .value,
-        _data.mUFState     .value,
-        _data.mSalineState .value,
-        _data.mHeparinState.value
+        _data.mSubMode          .value,
+        _data.mUFState          .value,
+        _data.mSalineState      .value,
+        _data.mHeparinState     .value,
+        _data.mRinsebackState   .value,
+        _data.mRecirculateState .value,
     };
 }
 
 bool MTreatmentStates::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mSubMode     ))
-    if (GetValue(vByteArray, index, _data.mUFState     ))
-    if (GetValue(vByteArray, index, _data.mSalineState ))
-    if (GetValue(vByteArray, index, _data.mHeparinState))
+    if (GetValue(vByteArray, index, _data.mSubMode          ))
+    if (GetValue(vByteArray, index, _data.mUFState          ))
+    if (GetValue(vByteArray, index, _data.mSalineState      ))
+    if (GetValue(vByteArray, index, _data.mHeparinState     ))
+    if (GetValue(vByteArray, index, _data.mRinsebackState   ))
+    if (GetValue(vByteArray, index, _data.mRecirculateState ))
         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; }
 }
 
 /*!
@@ -45,9 +51,11 @@
  */
 MTreatmentStates::Data MTreatmentStates::data() const {
     Data data;
-    data.mSubMode      = _data.mSubMode     .value;
-    data.mUFState      = _data.mUFState     .value;
-    data.mSalineState  = _data.mSalineState .value;
-    data.mHeparinState = _data.mHeparinState.value;
+    data.mSubMode           = _data.mSubMode         .value;
+    data.mUFState           = _data.mUFState         .value;
+    data.mSalineState       = _data.mSalineState     .value;
+    data.mHeparinState      = _data.mHeparinState    .value;
+    data.mRinsebackState    = _data.mRinsebackState  .value;
+    data.mRecirculateState  = _data.mRecirculateState.value;
     return data;
 }