Index: leahi_dialin/dd/modules/pre_gen_dialysate.py
===================================================================
diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df
--- leahi_dialin/dd/modules/pre_gen_dialysate.py	(.../pre_gen_dialysate.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
+++ leahi_dialin/dd/modules/pre_gen_dialysate.py	(.../pre_gen_dialysate.py)	(revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df)
@@ -7,23 +7,23 @@
 #
 # @file    pre_gen_dialysate.py
 #
-# @author  (last)      Micahel Garthwaite
-# @date    (last)      07-Mar-2023
+# @author  (last)      Zoltan Miskolci
+# @date    (last)      07-Jan-2026
 # @author  (original)  Micahel Garthwaite
 # @date    (original)  29-Oct-2020
 #
 ############################################################################
+
 import struct
-from enum import unique
 from logging import Logger
 
-from .constants import RESET, NO_RESET
+from leahi_dialin.common.constants import NO_RESET
 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, float_to_bytearray
+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
 
+
 class DDPreGenDialysate(AbstractSubSystem):
     """
     Pre Gen Dialysate
@@ -33,7 +33,6 @@
 
     def __init__(self, can_interface, logger: Logger):
         """
-
         @param can_interface: Leahi Can Messenger object
         """
         super().__init__()
@@ -62,6 +61,7 @@
         self.pre_gen_acid = 0
         self.pre_gen_bicarb  = 0
 
+
     @publish(["msg_id_dd_pre_gen_dialysate_state_data", "execution_state", "pre_gen_state_timestamp"])
     def _handler_pre_gen_state_sync(self, message, timestamp=0.0):
         """
@@ -70,12 +70,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]
 
         self.pre_gen_state_timestamp = timestamp
 
+
     @publish(["msg_id_dd_pre_gen_dialysate_request_data",
               "pre_gen_start", "pre_gen_dial_rate", "pre_gen_dial_temp",
               "pre_gen_acid", "pre_gen_bicarb",
@@ -87,7 +87,6 @@
         @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(
@@ -101,6 +100,7 @@
 
         self.pre_gen_request_timestamp = timestamp
 
+
     def cmd_pre_gen_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the broadcast time interval override for pre gen dialysate data.
@@ -112,25 +112,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_PRE_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST.value,
-                                              payload=payload)
-
-        self.logger.debug("Sending {} ms publish interval to the Pre-Gen 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
+        return cmd_generic_broadcast_interval_override(
+            ms = ms,
+            reset = reset,
+            channel_id = DenaliChannels.dialin_to_dd_ch_id,
+            msg_id = MsgIds.MSG_ID_DD_PRE_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST,
+            module_name = 'DD Pre-Gen Dialysate',
+            logger = self.logger,
+            can_interface = self.can_interface)