Index: sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp
===================================================================
diff -u -r1439734e9dc8384eff68c061b2930a737f4cfb5e -r9d27f14c2b528c0f199004614f10d55589e08614
--- sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp	(.../MTreatmentBloodFlowData.cpp)	(revision 1439734e9dc8384eff68c061b2930a737f4cfb5e)
+++ sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp	(.../MTreatmentBloodFlowData.cpp)	(revision 9d27f14c2b528c0f199004614f10d55589e08614)
@@ -18,29 +18,29 @@
 
 QVariantList MBloodFlow::parameters() const {
     return {
-        _data.mH4FlowSetPoint      .value,
-        _data.mH4MeasuredFlow      .value,
-        _data.mH4RotorSpeed        .value,
-        _data.mH4MotorSpeed        .value,
-        _data.mH4MotorCtlCurrent   .value,
-        _data.mH4RPM               .value,
-        _data.mH4RotorCount        .value,
-        _data.mH4PresFlow          .value,
-        _data.mH4RotorHall         .value,
+        _data. mH4SetFlowRate        .value,
+        _data. mH4MeasFlow           .value,
+        _data. mH4MeasRotorSpd       .value,
+        _data. mH4MeasPumpSpd        .value,
+        _data. mH4MeasCurr           .value,
+        _data. mH4SetRPM             .value,
+        _data. mH4RotorCount         .value,
+        _data. mH4PresFlow           .value,
+        _data. mH6RotorHallState    .value,
     };
 }
 
 bool MBloodFlow::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if ( ! GetValue(vByteArray, index, _data.mH4FlowSetPoint      )) goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mH4MeasuredFlow      )) goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mH4RotorSpeed        )) goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mH4MotorSpeed        )) goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mH4MotorCtlCurrent   )) goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mH4RPM               )) goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mH4RotorCount        )) goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mH4PresFlow          )) goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mH4RotorHall         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mH4SetFlowRate        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mH4MeasFlow           )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mH4MeasRotorSpd       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mH4MeasPumpSpd        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mH4MeasCurr           )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mH4SetRPM             )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mH4RotorCount         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mH4PresFlow           )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mH6RotorHallState     )) goto lError;
 
     return true ;
     
@@ -58,14 +58,14 @@
  */
 MBloodFlow::Data MBloodFlow::data() const {
     Data data;
-    data.mFlowSetPoint     = _data.mH4FlowSetPoint      .value;
-    data.mMeasuredFlow     = _data.mH4MeasuredFlow      .value;
-    data.mRotorSpeed       = _data.mH4RotorSpeed        .value;
-    data.mMotorSpeed       = _data.mH4MotorSpeed        .value;
-    data.mMotorCtlCurrent  = _data.mH4MotorCtlCurrent   .value;
-    data.mRPM              = _data.mH4RPM               .value;
-    data.mRotorCount       = _data.mH4RotorCount        .value;
-    data.mPresFlow         = _data.mH4PresFlow          .value;
-    data.mRotorHall        = _data.mH4RotorHall         .value;
+    data.mSetFlowRate     = _data. mH4SetFlowRate      .value;
+    data.mMeasFlow        = _data. mH4MeasFlow         .value;
+    data.mMeasRotorSpd    = _data. mH4MeasRotorSpd     .value;
+    data.mMeasPumpSpd     = _data. mH4MeasPumpSpd      .value;
+    data.mMeasCurr        = _data. mH4MeasCurr         .value;
+    data.mSetRPM          = _data. mH4SetRPM           .value;
+    data.mRotorCount      = _data. mH4RotorCount       .value;
+    data.mPresFlow        = _data. mH4PresFlow         .value;
+    data.mRotorHallState  = _data. mH6RotorHallState   .value;
     return data;
 }