Index: leahi_dialin/dd/proxies/td_proxy.py
===================================================================
diff -u -r941ca56f3f41c92c4b025a0713ee1d99c792aab8 -re45b20cdc5d4c5dcff8cef530b173ca94cb2e422
--- leahi_dialin/dd/proxies/td_proxy.py	(.../td_proxy.py)	(revision 941ca56f3f41c92c4b025a0713ee1d99c792aab8)
+++ leahi_dialin/dd/proxies/td_proxy.py	(.../td_proxy.py)	(revision e45b20cdc5d4c5dcff8cef530b173ca94cb2e422)
@@ -7,20 +7,23 @@
 #
 # @file    td_proxy.py
 #
-# @author  (last)      Micahel Garthwaite
-# @date    (last)      18-Aug-2023
+# @author  (last)      Zoltan Miskolci
+# @date    (last)      04-May-2026
 # @author  (original)  Peter Lucia
 # @date    (original)  02-Apr-2020
 #
 ############################################################################
 
-import struct
+# Module imports
 from logging import Logger
 
-from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
+# Project imports
+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_override
-from leahi_dialin.protocols.CAN import DenaliMessage, DenaliCanMessenger, 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
 
 
@@ -29,21 +32,20 @@
     Dialysate Delivery (DD) Dialin API sub-class for TD proxy ( injection ) related commands.
     """
 
-    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
+    def __init__(self, can_interface: CanMessenger, logger: Logger):
         """
         TDProxy constructor
 
-        @param can_interface: the Denali CAN interface object
+        @param can_interface: the CAN interface object
         """
         super().__init__()
         self.can_interface = can_interface
         self.logger = logger
 
         if self.can_interface is not None:
-            channel_id = DenaliChannels.td_to_dd_ch_id
-            msg_id = MsgIds.MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
-                                                                       self._handler_dialysate_delivery_request_response)
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_dd_ch_id,
+                                                                       message_id = MsgIds.MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA.value,
+                                                                       function = self._handler_dialysate_delivery_request_response)
 
         self.dialysate_delivery_request_start = 0
         self.dialysate_delivery_request_dial_rate = 0.0
@@ -68,21 +70,17 @@
         @param message:  published dialysate delivery request response data message
         @return: None
         """
-        self.dialysate_delivery_request_start = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.dialysate_delivery_request_dial_rate = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        self.dialysate_delivery_request_uf_rate = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-        self.dialysate_delivery_request_dial_temp = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-        self.dialysate_delivery_request_bypass = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
-        self.dialysate_delivery_request_acid = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
-        self.dialysate_delivery_request_bicarb = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
+        msg_list =[]
+        msg_list.append(('self.dialysate_delivery_request_start',       DataTypes.U32))
+        msg_list.append(('self.dialysate_delivery_request_dial_rate',   DataTypes.F32))
+        msg_list.append(('self.dialysate_delivery_request_uf_rate',     DataTypes.F32))
+        msg_list.append(('self.dialysate_delivery_request_dial_temp',   DataTypes.F32))
+        msg_list.append(('self.dialysate_delivery_request_bypass',      DataTypes.U32))
+        msg_list.append(('self.dialysate_delivery_request_acid',        DataTypes.U32))
+        msg_list.append(('self.dialysate_delivery_request_bicarb',      DataTypes.U32))
 
+        self.process_into_vars(decoder_list = msg_list,
+                               message = message)
         self.dd_td_to_dd_request_response_timestamp = timestamp
 
 
@@ -106,7 +104,7 @@
 
         cmd_generic_override(payload = payload,
                              reset = None,
-                             channel_id = DenaliChannels.dialin_to_dd_ch_id,
+                             channel_id = CanChannels.dialin_to_dd_ch_id,
                              msg_id = MsgIds.MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA,
                              entity_name = 'TD Gen Dialysate Request',
                              override_text = 'N/A',
@@ -136,7 +134,7 @@
 
         cmd_generic_override(payload = payload,
                              reset = None,
-                             channel_id = DenaliChannels.dialin_to_dd_ch_id,
+                             channel_id = CanChannels.dialin_to_dd_ch_id,
                              msg_id = MsgIds.MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA,
                              entity_name = 'TD Pre-Gen Dialysate Request',
                              override_text = 'N/A',