Index: leahi_dialin/dd/modules/concentrate_pump.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -r6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1
--- leahi_dialin/dd/modules/concentrate_pump.py	(.../concentrate_pump.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/dd/modules/concentrate_pump.py	(.../concentrate_pump.py)	(revision 6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1)
@@ -8,21 +8,24 @@
 # @file    concentrate_pumps.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 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_defs 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 DenaliCanMessenger, DenaliChannels
+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
 
 
@@ -31,7 +34,7 @@
         Dialin API sub-class for concentrate pumps related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         @param can_interface: Denali Can Messenger object
         """
@@ -41,10 +44,9 @@
         self.logger = logger
 
         if self.can_interface is not None:
-            channel_id = DenaliChannels.dd_sync_broadcast_ch_id
-            self.msg_id_dd_conc_pump_data = MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_conc_pump_data,
-                                                                       self._handler_concentrate_pumps_sync)
+            self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id,
+                                                                       message_id = MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_DATA.value,
+                                                                       function = self._handler_concentrate_pumps_sync)
 
         self.dd_concentrate_pump_timestamp = 0.0                #: The timestamp of the last message
 
@@ -95,57 +97,37 @@
         @param message:  published concentrate pumps' data message
         @return: None
         """
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name][dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED.name] = (
-            struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])))[0]
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name][dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED.name] = (
-            struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])))[0]
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name][dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED.name] = (
-            struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])))[0]
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name][dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED.name] = (
-            struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])))[0]
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name][dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT.name] = (
-            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])))[0]
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name][dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT.name] = (
-            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])))[0]
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name][dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT.name] = (
-            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])))[0]
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name][dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT.name] = (
-            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])))[0]
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name][dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE.name] = (
-            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])))[0]
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name][dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE.name] = (
-            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10])))[0]
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name][dd_enum_repository.DDConcentratePumpAttributes.PULSE_US.name] = (
-            struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11])))[0]
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name][dd_enum_repository.DDConcentratePumpAttributes.PULSE_US.name] = (
-            struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12])))[0]
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name][dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED.name] = (
-            struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13])))[0]
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name][dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED.name] = (
-            struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14])))[0]
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name][dd_enum_repository.DDConcentratePumpAttributes.PARKED.name] = \
-            True if struct.unpack('I', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15]))[0] == 1 else False
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name][dd_enum_repository.DDConcentratePumpAttributes.PARKED.name] = \
-            True if struct.unpack('I', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16]))[0] == 1 else False
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name][dd_enum_repository.DDConcentratePumpAttributes.PARK_FAULT.name] = \
-            True if struct.unpack('I', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_17:MsgFieldPositions.END_POS_FIELD_17]))[0] == 1 else False
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name][dd_enum_repository.DDConcentratePumpAttributes.PARK_FAULT.name] = \
-            True if struct.unpack('I', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_18:MsgFieldPositions.END_POS_FIELD_18]))[0] == 1 else False
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D76_UF.name][dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED.name] = (
-            struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_19:MsgFieldPositions.END_POS_FIELD_19])))[0]
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D76_UF.name][dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED.name] = (
-            struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_20:MsgFieldPositions.END_POS_FIELD_20])))[0]
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D76_UF.name][dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED.name] = (
-            struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_21:MsgFieldPositions.END_POS_FIELD_21])))[0]
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D76_UF.name][dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT.name] = (
-            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_22:MsgFieldPositions.END_POS_FIELD_22])))[0]
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D76_UF.name][dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT.name] = (
-            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_23:MsgFieldPositions.END_POS_FIELD_23])))[0]
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D76_UF.name][dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE.name] = (
-            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_24:MsgFieldPositions.END_POS_FIELD_24])))[0]
-        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D76_UF.name][dd_enum_repository.DDConcentratePumpAttributes.PULSE_US.name] = (
-            struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_25:MsgFieldPositions.END_POS_FIELD_25])))[0]
+        sensor_list =[]
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED,      DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED,         DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED,    DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED,       DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID, dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT,       DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT,     DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB, dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT,     DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT,   DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE,          DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE,        DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID, dd_enum_repository.DDConcentratePumpAttributes.PULSE_US,               DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB, dd_enum_repository.DDConcentratePumpAttributes.PULSE_US,             DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID, dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED,           DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB, dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED,         DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID, dd_enum_repository.DDConcentratePumpAttributes.PARKED,                 DataTypes.BOOL))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB, dd_enum_repository.DDConcentratePumpAttributes.PARKED,               DataTypes.BOOL))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID, dd_enum_repository.DDConcentratePumpAttributes.PARK_FAULT,             DataTypes.BOOL))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB, dd_enum_repository.DDConcentratePumpAttributes.PARK_FAULT,           DataTypes.BOOL))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF, dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED,                 DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED,            DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED,               DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF, dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT,             DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT,           DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE,                DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF, dd_enum_repository.DDConcentratePumpAttributes.PULSE_US,                     DataTypes.F32))
 
+        self.process_into_dict(dict_to_update = self.dd_concentrate_pumps,
+                               msg_list = sensor_list,
+                               message = message)
+
         self.dd_concentrate_pump_timestamp = timestamp