Index: leahi_dialin/dd/modules/pre_gen_dialysate.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -r6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1
--- leahi_dialin/dd/modules/pre_gen_dialysate.py	(.../pre_gen_dialysate.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/dd/modules/pre_gen_dialysate.py	(.../pre_gen_dialysate.py)	(revision 6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1)
@@ -8,20 +8,23 @@
 # @file    pre_gen_dialysate.py
 #
 # @author  (last)      Zoltan Miskolci
-# @date    (last)      07-Jan-2026
+# @date    (last)      04-May-2026
 # @author  (original)  Micahel Garthwaite
 # @date    (original)  29-Oct-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 MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem
+from leahi_dialin.utils.base import publish
 
 
 class DDPreGenDialysate(AbstractSubSystem):
@@ -31,7 +34,7 @@
     Dialysate Delivery (DD) Dialin API sub-class for pre gen dialysate related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         @param can_interface: Leahi Can Messenger object
         """
@@ -41,15 +44,13 @@
         self.logger = logger
 
         if self.can_interface is not None:
-            channel_id = DenaliChannels.dd_sync_broadcast_ch_id
-            self.msg_id_dd_pre_gen_dialysate_state_data = MsgIds.MSG_ID_DD_PRE_GEN_DIALYSATE_STATE_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_pre_gen_dialysate_state_data,
-                                                                       self._handler_pre_gen_state_sync)
+            self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id,
+                                                                       message_id = MsgIds.MSG_ID_DD_PRE_GEN_DIALYSATE_STATE_DATA.value,
+                                                                       function = self._handler_pre_gen_state_sync)
 
-            channel_id = DenaliChannels.dd_sync_broadcast_ch_id
-            self.msg_id_dd_pre_gen_dialysate_request_data = MsgIds.MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_pre_gen_dialysate_request_data,
-                                                                       self._handler_pre_gen_request_sync)
+            self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id,
+                                                                       message_id = MsgIds.MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA.value,
+                                                                       function = self._handler_pre_gen_request_sync)
 
         self.pre_gen_state_timestamp = 0                        #: The timestamp of the latest Pre-Gen State message
         self.execution_state = 0                                #: The execution state
@@ -70,9 +71,12 @@
         @param message: published pre gen dialysate data message
         @return: None
         """
-        self.execution_state = struct.unpack('I', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
+        msg_list =[]
+        msg_list.append(('self.execution_state', DataTypes.U32))
 
+        self.process_into_vars(decoder_list = msg_list,
+                               message = message)
+
         self.pre_gen_state_timestamp = timestamp
 
 
@@ -87,17 +91,16 @@
         @param message: published pre gen dialysate request message
         @return: None
         """
-        self.pre_gen_start = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.pre_gen_dial_rate = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        self.pre_gen_dial_temp = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-        self.pre_gen_acid = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-        self.pre_gen_bicarb = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
+        msg_list =[]
+        msg_list.append(('self.pre_gen_start',      DataTypes.U32))
+        msg_list.append(('self.pre_gen_dial_rate',  DataTypes.F32))
+        msg_list.append(('self.pre_gen_dial_temp',  DataTypes.F32))
+        msg_list.append(('self.pre_gen_acid',       DataTypes.U32))
+        msg_list.append(('self.pre_gen_bicarb',     DataTypes.U32))
 
+        self.process_into_vars(decoder_list = msg_list,
+                               message = message)
+
         self.pre_gen_request_timestamp = timestamp