Index: leahi_dialin/dd/modules/substitution_pump.py
===================================================================
diff -u -r2b259087a2c29d2f126510298ad75f362e0fc737 -r5f8fef12f850bb73e1f8e7d7372a404e9db07fa4
--- leahi_dialin/dd/modules/substitution_pump.py	(.../substitution_pump.py)	(revision 2b259087a2c29d2f126510298ad75f362e0fc737)
+++ leahi_dialin/dd/modules/substitution_pump.py	(.../substitution_pump.py)	(revision 5f8fef12f850bb73e1f8e7d7372a404e9db07fa4)
@@ -14,14 +14,19 @@
 #
 ############################################################################
 
+# Module imports
 import struct
 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 import dd_enum_repository
+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 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 +37,7 @@
     Dialysate Delivery (DD) Dialin API sub-class for substitution Pump related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: CanMessenger, logger: Logger):
         """
         @param can_interface: Denali Can Messenger object
         """
@@ -42,16 +47,21 @@
         self.logger = logger
 
         if self.can_interface is not None:
-            channel_id = DenaliChannels.dd_sync_broadcast_ch_id
-            self.msg_id_dd_substitution_pump_data = MsgIds.MSG_ID_DD_SUBSTITUTION_PUMP_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_substitution_pump_data,
-                                                                       self._handler_substitution_pump_sync)
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id,
+                                                                       message_id = MsgIds.MSG_ID_DD_SUBSTITUTION_PUMP_DATA.value,
+                                                                       function = self._handler_substitution_pump_sync)
 
+        #: The substitution pump data in dictionary format
+        self.dd_substitution_pumps = {
+            dd_enum_repository.DDSubstitutionPumpAttributes.TARGET_SPEED.name: 0.0,
+            dd_enum_repository.DDSubstitutionPumpAttributes.CURRENT_SPEED.name: 0.0,
+            dd_enum_repository.DDSubstitutionPumpAttributes.STATE.name: 0,
+            dd_enum_repository.DDSubstitutionPumpAttributes.MEASURED_SPEED.name: 0.0,
+        }
         self.dd_substitution_pump_timestamp = 0  #: The timestamp of the latest message
-        self.d92_set_ml_min = 0                  #: Set speed of d92 in mL/min
 
     @publish(["msg_id_dd_rinse_pump_data",
-              "d92_set_ml_min",
+              "dd_substitution_pumps",
               "dd_substitution_pump_timestamp"])
     def _handler_substitution_pump_sync(self, message, timestamp=0.0):
         """
@@ -60,9 +70,16 @@
         @param message:  published substitution pump data message
         @return: None
         """
-        self.d92_set_ml_min = struct.unpack('I', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
+        substitution_pump_list = []
+        substitution_pump_list.append((dd_enum_repository.DDSubstitutionPumpAttributes.TARGET_SPEED.name,   DataTypes.F32))
+        substitution_pump_list.append((dd_enum_repository.DDSubstitutionPumpAttributes.CURRENT_SPEED.name,  DataTypes.F32))
+        substitution_pump_list.append((dd_enum_repository.DDSubstitutionPumpAttributes.STATE.name,          DataTypes.U32))
+        substitution_pump_list.append((dd_enum_repository.DDSubstitutionPumpAttributes.MEASURED_SPEED.name, DataTypes.F32))
 
+        self.process_into_dict(dict_to_update = self.dd_substitution_pumps,
+                               decoder_list = substitution_pump_list,
+                               message = message)
+
         self.dd_substitution_pump_timestamp = timestamp
 
     def cmd_substitution_pump_data_publish_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
@@ -79,9 +96,9 @@
         return cmd_generic_broadcast_interval_override(
             ms=ms,
             reset=reset,
-            channel_id=DenaliChannels.dialin_to_dd_ch_id,
-            msg_id=MsgIds.MSG_ID_DD_SUBSTITUTION_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
-            module_name='DD Rinse Pump',
+            channel_id=CanChannels.dialin_to_dd_ch_id,
+            msg_id=MsgIds.MSG_ID_DD_SUBSTITUTION_PUMP_BROADCAST_OVERRIDE_REQUEST,
+            module_name='DD Substitution Pump',
             logger=self.logger,
             can_interface=self.can_interface)
 
@@ -102,9 +119,9 @@
         return cmd_generic_override(
             payload=payload,
             reset=NO_RESET,
-            channel_id=DenaliChannels.dialin_to_dd_ch_id,
+            channel_id=CanChannels.dialin_to_dd_ch_id,
             msg_id=MsgIds.MSG_ID_DD_SUBSTITUTION_PUMP_START_STOP_OVERRIDE_REQUEST,
-            entity_name=f'DD Substitution Pump speed',
+            entity_name=f'DD Substitution Pump start stop request',
             override_text=str(spd),
             logger=self.logger,
             can_interface=self.can_interface)