Index: leahi_dialin/td/modules/bubble_detector.py
===================================================================
diff -u -rf03c9a32180573f2430105ad69eb91d9f597a96b -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943
--- leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
+++ leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943)
@@ -8,17 +8,19 @@
 # @file    air_bubbles.py
 #
 # @author  (last)      Zoltan Miskolci
-# @date    (last)      09-Jan-2026
+# @date    (last)      05-May-2026
 # @author  (original)  Peman Montazemi
 # @date    (original)  18-May-2021
 #
 ############################################################################
 
-import struct
+# Module imports
 from logging import Logger
 
+# Project imports
 from leahi_dialin.common.constants import NO_RESET
-from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
+from leahi_dialin.common.generic_defs import DataTypes
+from leahi_dialin.common.msg_defs import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.common import td_enum_repository
 from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
@@ -53,10 +55,9 @@
         self.logger = logger
 
         if self.can_interface is not None:
-            channel_id = DenaliChannels.td_sync_broadcast_ch_id
-            self.msg_id_td_bubbles_data = MsgIds.MSG_ID_TD_BUBBLES_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_bubbles_data,
-                                                                       self._handler_air_bubbles_data_sync)
+            self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id,
+                                                                       message_id = MsgIds.MSG_ID_TD_BUBBLES_DATA.value,
+                                                                       function = self._handler_air_bubbles_data_sync)
 
         self.td_air_bubbles_timestamp = 0.0                     #: The timestamp of the last message
 
@@ -79,11 +80,13 @@
         @param message:  published air bubbles data message as: h18 bubble status, h18 bubble state
         @return: None
         """
-        self.h18_bubble_detector[td_enum_repository.TDAirBubbleDetectorNames.H18_ADV.name][td_enum_repository.TDAirBubbleDetectorAttributes.STATUS.name] = (
-            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])))[0]
-        self.h18_bubble_detector[td_enum_repository.TDAirBubbleDetectorNames.H18_ADV.name][td_enum_repository.TDAirBubbleDetectorAttributes.STATE.name] = (
-            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])))[0]
+        sensor_list =[]
+        sensor_list.append((td_enum_repository.TDAirBubbleDetectorNames.H18_ADV.name, td_enum_repository.TDAirBubbleDetectorAttributes.STATUS.name, DataTypes.U32))
+        sensor_list.append((td_enum_repository.TDAirBubbleDetectorNames.H18_ADV.name, td_enum_repository.TDAirBubbleDetectorAttributes.STATE.name,  DataTypes.U32))
 
+        self.process_into_dict(dict_to_update = self.h18_bubble_detector,
+                               decoder_list = sensor_list,
+                               message = message)
         self.td_air_bubbles_timestamp = timestamp