Index: leahi_dialin/td/modules/air_trap.py
===================================================================
diff -u -re8bdeec38984b4b800f6d0eca8b9097800efbf40 -rfc671af6d1a18c900812e68c42ca14da3280e4f1
--- leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision e8bdeec38984b4b800f6d0eca8b9097800efbf40)
+++ leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision fc671af6d1a18c900812e68c42ca14da3280e4f1)
@@ -20,7 +20,7 @@
 from leahi_dialin.common.constants import NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
-from leahi_dialin.common.td_defs import td_enum_repository
+from leahi_dialin.common import td_enum_repository
 from leahi_dialin.protocols.CAN import DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish
 from leahi_dialin.utils.conversions import integer_to_bytearray
@@ -51,6 +51,9 @@
             self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_air_trap_data,
                                                                        self._handler_air_trap_sync)
 
+        self.td_air_trap_timestamp = 0.0                        #: The timestamp of the last message
+
+        #: The Air Trap Level Sensors data in dictionary format
         self.air_trap_level_sensors = {
             td_enum_repository.TDAirTrapLevelSensorNames.H17_LEVEL.name: {
                 td_enum_repository.TDAirTrapLevelSensorAttributes.LEVEL.name: self.AIR_DETECTED_AT_LEVEL,
@@ -61,17 +64,18 @@
                 td_enum_repository.TDAirTrapLevelSensorAttributes.RAW.name: self.AIR_DETECTED_AT_LEVEL
             }
         }
+
+        #: The Air Trap Valves data in dictionary format
         self.air_trap_valve_states = {
             td_enum_repository.TDAirTrapValveNames.H13_VALV.name: 0,
             td_enum_repository.TDAirTrapValveNames.H20_VALV.name: 0
         }
-        self.air_control = 0
-        self.airTrapState = 0
+        self.air_control = 0                                    #: Is Air Trap FW logic is activated or not
+        self.airTrapState = 0                                   #: The Air Trap's state value
         # TODO remove after testing
         self.AirPumpLowerPowerLevel = 0
         # TODO remove after testing
         self.AirPumpRaisePowerLevel = 0
-        self.td_air_trap_timestamp = 0.0
 
 
     @publish(["msg_id_td_air_trap_data",