Index: sources/model/td/data/MTDAirTrapData.cpp
===================================================================
diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e
--- sources/model/td/data/MTDAirTrapData.cpp	(.../MTDAirTrapData.cpp)	(revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8)
+++ sources/model/td/data/MTDAirTrapData.cpp	(.../MTDAirTrapData.cpp)	(revision 1439734e9dc8384eff68c061b2930a737f4cfb5e)
@@ -18,25 +18,25 @@
 
 QVariantList MTDAirTrapData::parameters() const {
     return {
-        _data.mLowLevel     .value,
-        _data.mUpLevel      .value,
-        _data.mLowLevelRaw  .value,
-        _data.mUpLevelRaw   .value,
-        _data.mValveStateH13.value,
-        _data.mValveStateH20.value,
-        _data.mControlling  .value,
+        _data.mH17State        .value,
+        _data.mH16State        .value,
+        _data.mH17RawState     .value,
+        _data.mH16RawState     .value,
+        _data.mH13State        .value,
+        _data.mH20State        .value,
+        _data.mControlling     .value,
     };
 }
 
 bool MTDAirTrapData::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0;
-    if ( ! GetValue(vByteArray, index, _data.mLowLevel     )) goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mUpLevel      )) goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mLowLevelRaw  )) goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mUpLevelRaw   )) goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mValveStateH13)) goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mValveStateH20)) goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mControlling  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mH17State         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mH16State         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mH17RawState      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mH16RawState      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mH13State         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mH20State         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mControlling      )) goto lError;
 
     return true ;
     
@@ -53,12 +53,12 @@
  */
 MTDAirTrapData::Data MTDAirTrapData::data() const{
     Data data;
-    data.mLowLevel      = _data.mLowLevel         .value;
-    data.mUpLevel       = _data.mUpLevel          .value;
-    data.mLowLevelRaw   = _data.mLowLevelRaw      .value;
-    data.mUpLevelRaw    = _data.mUpLevelRaw       .value;
-    data.mValveStateH13 = _data.mValveStateH13    .value;
-    data.mValveStateH20 = _data.mValveStateH20    .value;
-    data.mControlling   = _data.mControlling      .value;
+    data.mLowLevel            = _data.mH17State        .value;
+    data.mUpLevel             = _data.mH16State        .value;
+    data.mLowLevelRaw         = _data.mH17RawState     .value;
+    data.mUpLevelRaw          = _data.mH16RawState     .value;
+    data.mValveIntakeState    = _data.mH13State        .value;
+    data.mValveOutletState    = _data.mH20State        .value;
+    data.mControlling         = _data.mControlling     .value;
     return data;
 }