Index: sources/model/td/data/MTDAirTrapData.cpp
===================================================================
diff -u -r1439734e9dc8384eff68c061b2930a737f4cfb5e -r291906e7a62816a10cb424389df9ac3704aa8dc3
--- sources/model/td/data/MTDAirTrapData.cpp	(.../MTDAirTrapData.cpp)	(revision 1439734e9dc8384eff68c061b2930a737f4cfb5e)
+++ sources/model/td/data/MTDAirTrapData.cpp	(.../MTDAirTrapData.cpp)	(revision 291906e7a62816a10cb424389df9ac3704aa8dc3)
@@ -18,25 +18,31 @@
 
 QVariantList MTDAirTrapData::parameters() const {
     return {
-        _data.mH17State        .value,
-        _data.mH16State        .value,
-        _data.mH17RawState     .value,
-        _data.mH16RawState     .value,
-        _data.mH13State        .value,
-        _data.mH20State        .value,
-        _data.mControlling     .value,
+        _data.mH17State                 .value,
+        _data.mH16State                 .value,
+        _data.mH17RawState              .value,
+        _data.mH16RawState              .value,
+        _data.mH13State                 .value,
+        _data.mH20State                 .value,
+        _data.mIsAutoControlling        .value,
+        _data.mAirTrapState             .value,
+        _data.mAirPumpLowerPowerLevel   .value,
+        _data.mAirPumpRaisePowerLevel   .value,
     };
 }
 
 bool MTDAirTrapData::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0;
-    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;
+    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.mIsAutoControlling        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mAirTrapState             )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mAirPumpLowerPowerLevel   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mAirPumpRaisePowerLevel   )) goto lError;
 
     return true ;
     
@@ -53,12 +59,15 @@
  */
 MTDAirTrapData::Data MTDAirTrapData::data() const{
     Data data;
-    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;
+    data.mH17State                 = _data.mH17State                 .value;
+    data.mH16State                 = _data.mH16State                 .value;
+    data.mH17RawState              = _data.mH17RawState              .value;
+    data.mH16RawState              = _data.mH16RawState              .value;
+    data.mH13State                 = _data.mH13State                 .value;
+    data.mH20State                 = _data.mH20State                 .value;
+    data.mIsAutoControlling        = _data.mIsAutoControlling        .value;
+    data.mAirTrapState             = _data.mAirTrapState             .value;
+    data.mAirPumpLowerPowerLevel   = _data.mAirPumpLowerPowerLevel   .value;
+    data.mAirPumpRaisePowerLevel   = _data.mAirPumpRaisePowerLevel   .value;
     return data;
 }