Index: leahi_dialin/td/modules/bubble_detector.py
===================================================================
diff -u -r1c451317473549058db3e3b8d9455c969bbb1516 -r20c821bd230fc7689a0275a2918981669ff5cc19
--- leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision 1c451317473549058db3e3b8d9455c969bbb1516)
+++ leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
@@ -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
@@ -35,9 +35,6 @@
     ADV: Air bubble Detector Venous
     """
 
-    # Air bubble detectors
-    H18_ADV = 0  # Air bubble Detector Venous
-
     # Air bubble detectors status
     BUBBLE_DETECTED_STATUS = 0   # Air bubble detected
     FLUID_DETECTED_STATUS = 1    # Fluid (no air bubble) detected
@@ -60,7 +57,9 @@
             self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_bubbles_data,
                                                                        self._handler_air_bubbles_data_sync)
 
-        self.td_air_bubbles_timestamp = 0.0
+        self.td_air_bubbles_timestamp = 0.0                     #: The timestamp of the last message
+
+        #: The TD Bubble Detector data in dictionary format
         self.h18_bubble_detector = {
             td_enum_repository.TDAirBubbleDetectorNames.H18_ADV.name: {
                 # Initialize status of ADV air bubble detectors to fluid (no air bubble) detected