Index: leahi_dialin/dd/modules/spent_chamber_fill.py
===================================================================
diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -r410054cfec7aee839266233249413b08b368fbd3
--- leahi_dialin/dd/modules/spent_chamber_fill.py	(.../spent_chamber_fill.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
+++ leahi_dialin/dd/modules/spent_chamber_fill.py	(.../spent_chamber_fill.py)	(revision 410054cfec7aee839266233249413b08b368fbd3)
@@ -7,22 +7,23 @@
 #
 # @file    spent_chamber_fill.py
 #
-# @author  (last)      Jonny Paguio
-# @date    (last)      26-Aug-2025
+# @author  (last)      Zoltan Miskolci
+# @date    (last)      07-Jan-2026
 # @author  (original)  Jonny Paguio
 # @date    (original)  26-Aug-2025
 #
 ############################################################################
+
 import struct
 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 DDSpentChamberFill(AbstractSubSystem):
     """
     Spent Chamber Fill
@@ -50,6 +51,7 @@
         self.total_spent_chamber_fill_counter = 0
         self.dd_spent_chamber_timestamp = 0
 
+
     @publish(["msg_id_dd_spent_chamber_fill_data",
               "execution_state", "switching_period",
               "total_spent_chamber_fill_counter",
@@ -61,7 +63,6 @@
         @param message:  published spent chamber fill 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.switching_period = struct.unpack('I', bytearray(
@@ -71,6 +72,7 @@
 
         self.dd_spent_chamber_timestamp = timestamp
 
+
     def cmd_spent_chamber_fill_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the spent chamber fill data broadcast interval override command
@@ -82,27 +84,11 @@
         @param reset:  integer - 1 to reset a previous override, 0 to override
         @return: 1 if successful, zero otherwise
         """
-
-        if not check_broadcast_interval_override_ms(ms):
-            return False
-
-        reset_byte_array = integer_to_bytearray(reset)
-        ms_byte_array = integer_to_bytearray(ms)
-        payload = reset_byte_array + ms_byte_array
-
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id,
-                                              message_id=MsgIds.MSG_ID_DD_SPENT_CHAMB_FILL_DATA_PUBLISH_OVERRIDE_REQUEST.value,
-                                              payload=payload)
-
-        self.logger.debug("override DD Spent Chamber Fill data broadcast interval")
-
-        # Send message
-        received_message = self.can_interface.send(message)
-
-        # If there is content...
-        if received_message is not None:
-            # response payload is OK or not OK
-            return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
-        else:
-            self.logger.error("Timeout!!!!")
-            return False
\ No newline at end of file
+        return cmd_generic_broadcast_interval_override(
+            ms = ms,
+            reset = reset,
+            channel_id = DenaliChannels.dialin_to_dd_ch_id,
+            msg_id = MsgIds.MSG_ID_DD_SPENT_CHAMB_FILL_DATA_PUBLISH_OVERRIDE_REQUEST,
+            module_name = 'DD Spent Chamber Fill',
+            logger = self.logger,
+            can_interface = self.can_interface)