Index: sources/model/td/data/MTDAirTrapData.h
===================================================================
diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e
--- sources/model/td/data/MTDAirTrapData.h	(.../MTDAirTrapData.h)	(revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8)
+++ sources/model/td/data/MTDAirTrapData.h	(.../MTDAirTrapData.h)	(revision 1439734e9dc8384eff68c061b2930a737f4cfb5e)
@@ -35,13 +35,13 @@
  *
  * | Payload  ||
  * |          ||
- * | #1:(U32) | \ref Data::mLowLevel        |
- * | #2:(U32) | \ref Data::mUpLevel         |
- * | #3:(U32) | \ref Data::mLowLevelRaw     |
- * | #4:(U32) | \ref Data::mUpLevelRaw      |
- * | #5:(U32) | \ref Data::mValveStateH13   |
- * | #6:(U32) | \ref Data::mValveStateH20   |
- * | #7:(U32) | \ref Data::mControlling     |
+ * | #1:(U32) | \ref Data::mLowLevel             |
+ * | #2:(U32) | \ref Data::mUpLevel              |
+ * | #3:(U32) | \ref Data::mLowLevelRaw          |
+ * | #4:(U32) | \ref Data::mUpLevelRaw           |
+ * | #5:(U32) | \ref Data::mValveIntakeState     |
+ * | #6:(U32) | \ref Data::mValveOutletState     |
+ * | #7:(U32) | \ref Data::mControlling          |
  *
  * \sa Data
  *
@@ -61,12 +61,12 @@
     QVariantList parameters() const override;
 
     struct {
-        Types::U32 mLowLevel        ;
-        Types::U32 mUpLevel         ;
-        Types::U32 mLowLevelRaw     ;
-        Types::U32 mUpLevelRaw      ;
-        Types::U32 mValveStateH13   ;
-        Types::U32 mValveStateH20   ;
+        Types::U32 mH17State        ;
+        Types::U32 mH16State        ;
+        Types::U32 mH17RawState     ;
+        Types::U32 mH16RawState     ;
+        Types::U32 mH13State        ;
+        Types::U32 mH20State        ;
         Types::U32 mControlling     ;
     } _data;
 
@@ -78,13 +78,13 @@
 
 
     struct Data {
-        quint32 mLowLevel        = 0; ///< lower level value
-        quint32 mUpLevel         = 0; ///< upper level value
-        quint32 mLowLevelRaw     = 0; ///< lower level raw value
-        quint32 mUpLevelRaw      = 0; ///< upper level raw value
-        quint32 mValveStateH13   = 0; ///< air valve H13 state
-        quint32 mValveStateH20   = 0; ///< air valve H20 state
-        quint32 mControlling     = 0; ///< air control
+        quint32 mLowLevel               = 0; ///< lower level value
+        quint32 mUpLevel                = 0; ///< upper level value
+        quint32 mLowLevelRaw            = 0; ///< lower level raw value
+        quint32 mUpLevelRaw             = 0; ///< upper level raw value
+        quint32 mValveIntakeState       = 0; ///< Air trap intake Valve state (open/closed)
+        quint32 mValveOutletState       = 0; ///< Air trap outlet valve state (open/closed)
+        quint32 mControlling            = 0; ///< air control
     };
 
     MTDAirTrapData () { }