Index: leahi_dialin/td/modules/pressure_sensors.py
===================================================================
diff -u -r21a1d644c7d02e7588781b9025b422aa9d74c9ca -re45b20cdc5d4c5dcff8cef530b173ca94cb2e422
--- leahi_dialin/td/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 21a1d644c7d02e7588781b9025b422aa9d74c9ca)
+++ leahi_dialin/td/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision e45b20cdc5d4c5dcff8cef530b173ca94cb2e422)
@@ -8,22 +8,26 @@
 # @file    pressure_occlusion.py
 #
 # @author  (last)      Zoltan Miskolci
-# @date    (last)      08-Jan-2026
+# @date    (last)      05-May-2026
 # @author  (original)  Peter Lucia
 # @date    (original)  02-Apr-2020
 #
 ############################################################################
 
-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 MsgFieldPositions
+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.common import td_enum_repository
 
-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, float_to_bytearray
 
 
@@ -32,7 +36,7 @@
     Treatment Delivery (TD) Dialin API sub-class for pressure related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: CanMessenger, logger: Logger):
         """
         TDPressureSensors constructor
         """
@@ -41,10 +45,9 @@
         self.logger = logger
 
         if self.can_interface is not None:
-            channel_id = DenaliChannels.td_sync_broadcast_ch_id
-            self.msg_id_td_pressure_data = MsgIds.MSG_ID_TD_PRESSURE_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_pressure_data,
-                                                                       self._handler_pressure_sync)
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id,
+                                                                       message_id = MsgIds.MSG_ID_TD_PRESSURE_DATA.value,
+                                                                       function = self._handler_pressure_sync)
         
         self.td_pressure_timestamp = 0.0                #: The timestamp of the latest message
         
@@ -64,14 +67,16 @@
             },
             td_enum_repository.TDPressureSensorNames.H23_PRES.name: {
                 td_enum_repository.TDPressureSensorAttributes.PRES.name : 0.0
+            },
+            'TMP_PRES': {
+                td_enum_repository.TDPressureSensorAttributes.PRES.name: 0.0,
+                td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name: 0.0,
+                td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name: 0,
+                td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name: 0
             }
         }
         
         self.pressure_limits_state = 0                  #: Pressure limits state value
-        self.tmp_pressure = 0.0                         #: Transmembrane pressure value
-        self.tmp_long_filtered_pressure = 0.0           #: Transmembrane average (over 10 seconds) pressure value
-        self.tmp_min_limit = 0.0                        #: Transmembrane pressure minimum limit value
-        self.tmp_max_limit = 0.0                        #: Transmembrane pressure maximum limit value
 
 
     @publish([
@@ -92,33 +97,39 @@
         @param message:  published pressure & occlusion data message
         @return: none
         """
-        sensor_list =[]
-        sensor_list.append(['self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H2_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES.name]', 'f'])
-        sensor_list.append(['self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H14_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES.name]', 'f'])
-        sensor_list.append(['self.pressure_limits_state', 'i'])
-        # Every singed integer should be little endian
-        # TODO: update to 'i' after LDT-473 is merged
-        sensor_list.append(['self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H2_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name]', '<i'])
-        sensor_list.append(['self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H2_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name]', '<i'])
-        sensor_list.append(['self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H14_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name]', '<i'])
-        sensor_list.append(['self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H14_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name]', '<i'])
-        sensor_list.append(['self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H2_PRES.name][td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name]', 'f'])
-        sensor_list.append(['self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H14_PRES.name][td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name]', 'f'])
-        sensor_list.append(['self.tmp_pressure', 'f'])
-        sensor_list.append(['self.tmp_long_filtered_pressure', 'f'])
-        sensor_list.append(['self.tmp_min_limit', 'f'])
-        sensor_list.append(['self.tmp_max_limit', 'f'])
-        sensor_list.append(['self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H23_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES.name]', 'f'])
+        sensor_list_1 = []
+        sensor_list_1.append((td_enum_repository.TDPressureSensorNames.H2_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES.name,     DataTypes.F32))
+        sensor_list_1.append((td_enum_repository.TDPressureSensorNames.H14_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES.name,    DataTypes.F32))
+        msg_list_1 = []
+        msg_list_1.append(['self.pressure_limits_state', DataTypes.U32])
+        sensor_list_2 = []
+        sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H2_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name,             DataTypes.U32))
+        sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H2_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name,             DataTypes.U32))
+        sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H14_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name,            DataTypes.U32))
+        sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H14_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name,            DataTypes.U32))
+        sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H2_PRES.name, td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name,     DataTypes.F32))
+        sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H14_PRES.name, td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name,    DataTypes.F32))
+        sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H14_PRES.name, td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name,    DataTypes.F32))
+        sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H14_PRES.name, td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name,    DataTypes.F32))
+        sensor_list_2.append(('TMP_PRES', td_enum_repository.TDPressureSensorAttributes.PRES.name,                                                                  DataTypes.F32))
+        sensor_list_2.append(('TMP_PRES', td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name,                                                DataTypes.F32))
+        sensor_list_2.append(('TMP_PRES', td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name,                                                        DataTypes.F32))
+        sensor_list_2.append(('TMP_PRES', td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name,                                                        DataTypes.F32))
+        sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H23_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES.name,                      DataTypes.F32))
 
-        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}')
-            value = struct.unpack(sensor[1],bytearray(message['message'][start_pos:end_pos]))[0]
-            if 'nan' in str(value).lower():
-                value = 0.0
-            exec(f'{sensor[0]} = {value}')
-            i += 1
+        self.process_into_dict(dict_to_update = self.td_pressure_sensors,
+                               decoder_list = sensor_list_1,
+                               message = message)
+
+        self.process_into_vars(decoder_list = msg_list_1,
+                               message = message,
+                               start_from_byte = len(sensor_list_1) * DataTypes.F32.size())
+
+        self.process_into_dict(dict_to_update = self.td_pressure_sensors,
+                               decoder_list = sensor_list_2,
+                               message = message,
+                               start_from_byte = (len(sensor_list_1) + len(msg_list_1)) * DataTypes.F32.size())
+
         self.td_pressure_timestamp = timestamp
 
 
@@ -136,7 +147,7 @@
         return cmd_generic_broadcast_interval_override(
             ms = ms,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_td_ch_id,
+            channel_id = CanChannels.dialin_to_td_ch_id,
             msg_id = MsgIds.MSG_ID_TD_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
             module_name = 'TD Pressure Sensors',
             logger = self.logger,
@@ -164,7 +175,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_td_ch_id,
+            channel_id = CanChannels.dialin_to_td_ch_id,
             msg_id = MsgIds.MSG_ID_TD_PRESSURE_OVERRIDE_REQUEST,
             entity_name = f'TD {sensor_name} Pressure Sensor pressure',
             override_text = str(prs) + " mmHg.  ",
@@ -190,7 +201,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_td_ch_id,
+            channel_id = CanChannels.dialin_to_td_ch_id,
             msg_id = MsgIds.MSG_ID_TD_TMP_PRESSURE_OVERRIDE_REQUEST,
             entity_name = 'TD TMP Pressure Sensor pressure',
             override_text = str(prs) + " mmHg.  ",
@@ -216,7 +227,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_td_ch_id,
+            channel_id = CanChannels.dialin_to_td_ch_id,
             msg_id = MsgIds.MSG_ID_TD_BARO_PRESSURE_OVERRIDE,
             entity_name = 'TD Barometric Pressure Sensor pressure',
             override_text = str(prs) + " PSI.  ",