Index: leahi_dialin/dd/modules/rinse_pump.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -re45b20cdc5d4c5dcff8cef530b173ca94cb2e422
--- leahi_dialin/dd/modules/rinse_pump.py	(.../rinse_pump.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/dd/modules/rinse_pump.py	(.../rinse_pump.py)	(revision e45b20cdc5d4c5dcff8cef530b173ca94cb2e422)
@@ -8,20 +8,23 @@
 # @file    rinse_pump.py
 #
 # @author  (last)      Zoltan Miskolci
-# @date    (last)      07-Jan-2026
+# @date    (last)      04-May-2026
 # @author  (original)  Jonny Paguio
 # @date    (original)  13-Oct-2025
 #
 ############################################################################
 
-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_ids 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,20 +35,19 @@
     Dialysate Delivery (DD) Dialin API sub-class for Rinse 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
+        @param can_interface: Can Messenger object
         """
         super().__init__()
 
         self.can_interface = can_interface
         self.logger = logger
 
         if self.can_interface is not None:
-            channel_id = DenaliChannels.dd_sync_broadcast_ch_id
-            self.msg_id_dd_rinse_pump_data = MsgIds.MSG_ID_DD_RINSE_PUMP_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_rinse_pump_data,
-                                                                       self._handler_rinse_pump_sync)
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id,
+                                                                       message_id = MsgIds.MSG_ID_DD_RINSE_PUMP_DATA.value,
+                                                                       function = self._handler_rinse_pump_sync)
 
         self.dd_rinse_pump_timestamp = 0                        #: The timestamp of the latest message
         self.d79_state = 0                                      #: The State of the D79 Pump
@@ -63,13 +65,13 @@
         @param message:  published rinse pump data message
         @return: None
         """
-        self.d79_state = struct.unpack('I', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.d79_pump_pwm = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        self.d79_pump_rpm = struct.unpack('I', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
+        msg_list =[]
+        msg_list.append(('self.d79_state',      DataTypes.U32))
+        msg_list.append(('self.d79_pump_pwm',   DataTypes.F32))
+        msg_list.append(('self.d79_pump_rpm',   DataTypes.U32))
 
+        self.process_into_vars(decoder_list = msg_list,
+                               message = message)
         self.dd_rinse_pump_timestamp = timestamp
 
 
@@ -87,7 +89,7 @@
         return cmd_generic_broadcast_interval_override(
             ms = ms,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_dd_ch_id,
+            channel_id = CanChannels.dialin_to_dd_ch_id,
             msg_id = MsgIds.MSG_ID_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
             module_name = 'DD Rinse Pump',
             logger = self.logger,
@@ -112,7 +114,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_dd_ch_id,
+            channel_id = CanChannels.dialin_to_dd_ch_id,
             msg_id = MsgIds.MSG_ID_DD_RINSE_PUMP_PWM_PERCENT_OVERRIDE_REQUEST,
             entity_name = f'DD Rinse Pump PWM',
             override_text = str(pwm_pct),
@@ -136,7 +138,7 @@
         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_RINSE_PUMP_TURN_ON_OFF_REQUEST,
             entity_name = f'DD Rinse Pump state',
             override_text = 'On' if on_off == 1 else 'Off',