Index: leahi_dialin/dd/modules/levels.py
===================================================================
diff -u -r344ffd41f5460e1f0a9275192fdf5c47caeb6771 -re45b20cdc5d4c5dcff8cef530b173ca94cb2e422
--- leahi_dialin/dd/modules/levels.py	(.../levels.py)	(revision 344ffd41f5460e1f0a9275192fdf5c47caeb6771)
+++ leahi_dialin/dd/modules/levels.py	(.../levels.py)	(revision e45b20cdc5d4c5dcff8cef530b173ca94cb2e422)
@@ -8,21 +8,24 @@
 # @file    levels.py
 #
 # @author  (last)      Zoltan Miskolci
-# @date    (last)      07-Jan-2026
+# @date    (last)      04-May-2026
 # @author  (original)  Dara Navaei
 # @date    (original)  29-May-2020
 #
 ############################################################################
 
-import struct
+# Module imports
 from logging import Logger
 
+# Project imports
 from leahi_dialin.common.constants import NO_RESET
 from leahi_dialin.common import dd_enum_repository
-from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
+from leahi_dialin.common.generic_defs import DataTypes
+from leahi_dialin.common.msg_ids import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import CanMessenger, CanChannels
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem
+from leahi_dialin.utils.base import publish
 from leahi_dialin.utils.conversions import integer_to_bytearray
 
 
@@ -31,19 +34,19 @@
     Dialysate Delivery (DD) Dialin API sub-class for levels related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: CanMessenger, logger: Logger):
         """
-        @param can_interface: Denali CAN Messenger object
+        @param can_interface: Can Messenger object
         """
         super().__init__()
 
         self.can_interface = can_interface
         self.logger = logger
 
         if self.can_interface is not None:
-            channel_id = DenaliChannels.dd_sync_broadcast_ch_id
-            self.msg_id_dd_level_data = MsgIds.MSG_ID_DD_LEVEL_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_level_data, self._handler_levels_sync)
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id,
+                                                                       message_id = MsgIds.MSG_ID_DD_LEVEL_DATA.value,
+                                                                       function = self._handler_levels_sync)
 
         self.dd_levels_timestamp = 0                            #: The timestamp of the latest message
 
@@ -66,19 +69,19 @@
         @returns none
         """
         sensor_list =[]
-        sensor_list.append((dd_enum_repository.DDLevelSensorNames.D46_LEVEL, 'i'))
-        sensor_list.append((dd_enum_repository.DDLevelSensorNames.D63_LEVEL, 'i'))
-        sensor_list.append((dd_enum_repository.DDLevelSensorNames.D98_LEVEL, 'i'))
-        sensor_list.append((dd_enum_repository.DDLevelSensorNames.D6_LEVEL, 'i'))
+        sensor_list.append((dd_enum_repository.DDLevelSensorNames.D46_LEVEL.name,   DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDLevelSensorNames.D63_LEVEL.name,   DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDLevelSensorNames.D98_LEVEL.name,   DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDLevelSensorNames.D6_LEVEL.name,    DataTypes.U32))
+        msg_list =[]
+        msg_list.append(('self.dd_bicarb_level', DataTypes.U32))
 
-        i = 1
-        for sensor in sensor_list:
-            start_pos = eval(f'MsgFieldPositions.START_POS_FIELD_{i}')
-            end_pos = eval(f'MsgFieldPositions.END_POS_FIELD_{i}')
-            self.dd_level_sensors[sensor[0].name] = struct.unpack(sensor[1], bytearray(message['message'][start_pos:end_pos]))[0]
-            i += 1
-        self.dd_bicarb_level = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
+        self.process_into_dict(dict_to_update = self.dd_level_sensors,
+                               decoder_list = sensor_list,
+                               message = message)
+        self.process_into_vars(decoder_list = msg_list,
+                               message = message,
+                               start_from_byte = len(sensor_list) * DataTypes.U32.size())
         self.dd_levels_timestamp = timestamp
 
 
@@ -96,7 +99,7 @@
         return cmd_generic_broadcast_interval_override(
             ms = ms,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_dd_ch_id,
+            channel_id = CanChannels.dialin_to_dd_ch_id,
             msg_id = MsgIds.MSG_ID_DD_LEVELS_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
             module_name = 'DD Levels',
             logger = self.logger,
@@ -122,7 +125,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_dd_ch_id,
+            channel_id = CanChannels.dialin_to_dd_ch_id,
             msg_id = MsgIds.MSG_ID_DD_LEVELS_STATUS_OVERRIDE_REQUEST,
             entity_name = f'DD {sensor_name} Level Status',
             override_text = str(status),
@@ -148,7 +151,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_fp_ch_id,
+            channel_id = CanChannels.dialin_to_fp_ch_id,
             msg_id = MsgIds.MSG_ID_DD_FLOATER_LEVEL_OVERRIDE_REQUEST,
             entity_name = f'DD Floater Levels status',
             override_text = f'{str(status)}',