Index: leahi_dialin/td/modules/buttons.py
===================================================================
diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -r03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93
--- leahi_dialin/td/modules/buttons.py	(.../buttons.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
+++ leahi_dialin/td/modules/buttons.py	(.../buttons.py)	(revision 03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93)
@@ -7,18 +7,20 @@
 #
 # @file    buttons.py
 #
-# @author  (last)      Micahel Garthwaite
-# @date    (last)      05-Nov-2024
+# @author  (last)      Zoltan Miskolci
+# @date    (last)      08-Jan-2026
 # @author  (original)  Peter Lucia
 # @date    (original)  14-Oct-2024
 #
 ############################################################################
+
 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, DenaliCanMessenger, DenaliChannels
+from leahi_dialin.common.override_templates import cmd_generic_override
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish
 from leahi_dialin.utils.conversions import integer_to_bytearray
 
@@ -34,7 +36,6 @@
 
         @param can_interface: the Denali CAN interface object
         """
-
         super().__init__()
         self.can_interface = can_interface
         self.logger = logger
@@ -47,15 +48,16 @@
                                                                        self._handler_poweroff_timeout_occurred)
         self.td_power_off_timestamp = 0.0
 
+
     def reset_poweroff_timeout_expired(self):
         """
         Resets the dialin poweroff timeout flag to False
 
         @return: None
         """
-
         self.poweroff_timeout_expired = False
 
+
     @publish(['msg_id_off_button_press_request', 'poweroff_timeout_expired', 'td_power_off_timestamp'])
     def _handler_poweroff_timeout_occurred(self, message, timestamp=0.0):
         """
@@ -75,6 +77,7 @@
             self.poweroff_timeout_expired = bool(mode[0])
         self.td_power_off_timestamp = timestamp
 
+
     def cmd_off_button_override(self, state: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the Off button override command
@@ -92,30 +95,18 @@
         sta = integer_to_bytearray(state)
         payload = rst + sta
 
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id,
-                                              message_id=MsgIds.MSG_ID_TD_OFF_BUTTON_OVERRIDE_REQUEST.value,
-                                              payload=payload)
+        state_name = 'Pressed' if state == 1 else 'Released'
+        return cmd_generic_override(
+            payload = payload,
+            reset = NO_RESET,
+            channel_id = DenaliChannels.dialin_to_td_ch_id,
+            msg_id = MsgIds.MSG_ID_TD_OFF_BUTTON_OVERRIDE_REQUEST,
+            entity_name = f'TD Off Button',
+            override_text = f'{state_name}',
+            logger = self.logger,
+            can_interface = self.can_interface)
 
-        self.logger.debug("override off button")
 
-        # Send message
-        received_message = self.can_interface.send(message)
-
-        # If there is content...
-        if received_message is not None:
-            if reset == RESET:
-                str_res = "reset back to normal"
-            else:
-                str_res = ("pressed" if state != 0 else "released")
-
-            self.logger.debug("Off button overridden to " + str_res + ":" +
-                              str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]))
-            # response payload is OK or not OK
-            return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
-        else:
-            self.logger.debug("Timeout!!!!")
-            return False
-
     def cmd_stop_button_override(self, state: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the Stop button override command
@@ -133,26 +124,13 @@
         sta = integer_to_bytearray(state)
         payload = rst + sta
 
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id,
-                                              message_id=MsgIds.MSG_ID_TD_STOP_BUTTON_OVERRIDE_REQUEST.value,
-                                              payload=payload)
-
-        self.logger.debug("override stop button")
-
-        # Send message
-        received_message = self.can_interface.send(message)
-
-        # If there is content...
-        if received_message is not None:
-            if reset == RESET:
-                str_res = "reset back to normal"
-            else:
-                str_res = ("pressed" if state != 0 else "released")
-            self.logger.debug("Stop button overridden to " + str_res + ":" +
-                              str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]))
-
-            # response payload is OK or not OK
-            return received_message["message"][DenaliMessage.PAYLOAD_START_INDEX]
-        else:
-            self.logger.debug("Timeout!!!!")
-            return False
+        state_name = 'Pressed' if state == 1 else 'Released'
+        return cmd_generic_override(
+            payload = payload,
+            reset = NO_RESET,
+            channel_id = DenaliChannels.dialin_to_td_ch_id,
+            msg_id = MsgIds.MSG_ID_TD_STOP_BUTTON_OVERRIDE_REQUEST,
+            entity_name = f'TD Stop Button',
+            override_text = f'{state_name}',
+            logger = self.logger,
+            can_interface = self.can_interface)