Index: leahi_dialin/dd/modules/ultrafiltration.py
===================================================================
diff -u -r256ffed682a9c78ee890a3f3132eb6c6518e7ee8 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6
--- leahi_dialin/dd/modules/ultrafiltration.py	(.../ultrafiltration.py)	(revision 256ffed682a9c78ee890a3f3132eb6c6518e7ee8)
+++ leahi_dialin/dd/modules/ultrafiltration.py	(.../ultrafiltration.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
@@ -7,33 +7,35 @@
 #
 # @file    ultrafiltration.py
 #
-# @author  (last)      Micahel Garthwaite
-# @date    (last)      07-Mar-2023
+# @author  (last)      Zoltan Miskolci
+# @date    (last)      04-May-2026
 # @author  (original)  Micahel Garthwaite
 # @date    (original)  29-Oct-2020
 #
 ############################################################################
-import struct
-from enum import unique
+
+# Module imports
 from logging import Logger
 
-from .constants import RESET, NO_RESET
+# Project imports
+from leahi_dialin.common.constants import NO_RESET
+from leahi_dialin.common.generic_defs import DataTypes
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum
-from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
-from leahi_dialin.utils.conversions import integer_to_bytearray
+from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override
+from leahi_dialin.protocols.CAN import CanMessenger, CanChannels
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem
+from leahi_dialin.utils.base import publish
 
+
 class DDUltrafiltration(AbstractSubSystem):
     """
     Ultrafiltration
 
     Dialysate Delivery (DD) Dialin API sub-class for post gen dialysate related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: CanMessenger, logger: Logger):
         """
-
         @param can_interface: Leahi Can Messenger object
         """
         super().__init__()
@@ -42,37 +44,38 @@
         self.logger = logger
 
         if self.can_interface is not None:
-            channel_id = DenaliChannels.dd_sync_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_DD_UF_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
-                                                                       self._handler_ultrafiltration_sync)
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id,
+                                                                       message_id = MsgIds.MSG_ID_DD_UF_DATA.value,
+                                                                       function = self._handler_ultrafiltration_sync)
 
-        self.uf_exec_state = 0
-        self.uf_rate = 0.0
-        self.compensated_uf_rate = 0.0
-        self.is_uf_requested = 0
-        self.uf_timestamp = 0.0
+        self.uf_timestamp = 0.0                                 #: The timestamp of the latest message
+        self.uf_exec_state = 0                                  #: The Ultrafiltration execution state
+        self.uf_rate = 0.0                                      #: The Ultrafiltration rate
+        self.compensated_uf_rate = 0.0                          #: The Compensated Ultrafiltration rate
+        self.is_uf_requested = 0                                #: Is Ultrafiltration requested or not
 
-    @publish(["uf_timestamp", "uf_exec_state","uf_rate","compensated_uf_rate","is_uf_requested"])
+
+    @publish(["msg_id_dd_uf_data", "uf_exec_state","uf_rate",
+              "compensated_uf_rate", "is_uf_requested",
+              "uf_timestamp"])
     def _handler_ultrafiltration_sync(self, message, timestamp=0.0):
         """
         Handles published ultrafiltration data messages.
 
         @param message: published ultrafiltration data message
         @return: None
         """
+        msg_list =[]
+        msg_list.append(('self.uf_exec_state',          DataTypes.U32))
+        msg_list.append(('self.uf_rate',                DataTypes.F32))
+        msg_list.append(('self.compensated_uf_rate',    DataTypes.F32))
+        msg_list.append(('self.is_uf_requested',        DataTypes.U32))
 
-        self.uf_exec_state = struct.unpack('I', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.uf_rate = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        self.compensated_uf_rate = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-        self.is_uf_requested = struct.unpack('I', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-
+        self.process_into_vars(decoder_list = msg_list,
+                               message = message)
         self.uf_timestamp = timestamp
 
+
     def cmd_uf_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the broadcast time interval override for ultrafiltration data.
@@ -84,25 +87,11 @@
         @param reset: (int) 1 to reset a previous override, 0 to override
         @returns 1 if successful, zero otherwise
         """
-        if not check_broadcast_interval_override_ms(ms):
-            return False
-
-        reset_value = integer_to_bytearray(reset)
-        interval_value = integer_to_bytearray(ms)
-        payload = reset_value + interval_value
-
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id,
-                                              message_id=MsgIds.MSG_ID_DD_UF_DATA_PUBLISH_OVERRIDE_REQUEST.value,
-                                              payload=payload)
-
-        self.logger.debug("Sending {} ms publish interval to the Ultrafiltration module".format(ms))
-        # Send message
-        received_message = self.can_interface.send(message)
-
-        # If there is content in message
-        if received_message is not None:
-            # Response payload is OK or not
-            return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
-        else:
-            self.logger.debug("Timeout!!!!")
-            return False
\ No newline at end of file
+        return cmd_generic_broadcast_interval_override(
+            ms = ms,
+            reset = reset,
+            channel_id = CanChannels.dialin_to_dd_ch_id,
+            msg_id = MsgIds.MSG_ID_DD_UF_DATA_PUBLISH_OVERRIDE_REQUEST,
+            module_name = 'DD Ultrafiltration',
+            logger = self.logger,
+            can_interface = self.can_interface)