Index: leahi_dialin/td/modules/air_pump.py
===================================================================
diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df
--- leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
+++ leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df)
@@ -7,8 +7,8 @@
 #
 # @file    air_pump.py
 #
-# @author  (last)      Micahel Garthwaite
-# @date    (last)      10-Mar-2023
+# @author  (last)      Zoltan Miskolci
+# @date    (last)      08-Jan-2026
 # @author  (original)  Micahel Garthwaite
 # @date    (original)  01-Nov-2024
 #
@@ -17,12 +17,12 @@
 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.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.common.td_defs import TDAirPumpNames, TDAirPumpAttributes
-from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
+from leahi_dialin.protocols.CAN import DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish
-from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
 from leahi_dialin.utils.conversions import integer_to_bytearray
 
 
@@ -35,7 +35,6 @@
 
     def __init__(self, can_interface, logger: Logger):
         """
-
         @param can_interface: Denali Can Messenger object
         """
         super().__init__()
@@ -57,6 +56,7 @@
 
         self.td_air_pump_timestamp = 0.0
 
+
     @publish(["msg_id_td_air_pump_data", "td_air_pump", "td_air_pump_timestamp"])
     def _handler_air_pump_sync(self, message, timestamp=0.0):
         """
@@ -74,35 +74,7 @@
         self.td_air_pump[TDAirPumpNames.H12_AIR_PUMP.name][TDAirPumpAttributes.POWER.name] = app[0]
         self.td_air_pump_timestamp = timestamp
 
-    def cmd_air_pump_set_state(self, state: int, power: int) -> int:
-        """
-        Constructs and sends the air pump set state command.
 
-        Constraints:
-            Must be logged into TD.
-        @param power:  integer - 0-255 value to set the air pump power
-        @return: 1 if successful, zero otherwise
-        """
-
-        sts = integer_to_bytearray(state)
-        pwr = integer_to_bytearray(power)
-        payload = sts + pwr
-
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id,
-                                              message_id=MsgIds.MSG_ID_TD_AIR_PUMP_SET_STATE_REQUEST.value,
-                                              payload=payload)
-
-        # 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.debug("Timeout!!!!")
-            return False
-
     def cmd_air_pump_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the air pump data broadcast interval override command
@@ -114,33 +86,38 @@
         @param reset:  integer - 1 to reset a previous override, 0 to override
         @return: 1 if successful, zero otherwise
         """
+        return cmd_generic_broadcast_interval_override(
+            ms = ms,
+            reset = reset,
+            channel_id = DenaliChannels.dialin_to_td_ch_id,
+            msg_id = MsgIds.MSG_ID_TD_AIR_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
+            module_name = 'TD Air Pump',
+            logger = self.logger,
+            can_interface = self.can_interface)
 
-        if not check_broadcast_interval_override_ms(ms):
-            return False
 
-        rst = integer_to_bytearray(reset)
-        mis = integer_to_bytearray(ms)
-        payload = rst + mis
+    def cmd_air_pump_set_state(self, state: int, power: int) -> int:
+        """
+        Constructs and sends the air pump set state command.
 
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id,
-                                              message_id=MsgIds.MSG_ID_TD_AIR_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value,
-                                              payload=payload)
+        Constraints:
+            Must be logged into TD.
+        @param state:  integer - 1 to stop the pump, 2 to activate it
+        @param power:  integer - 0-255 value to set the air pump power
+        @return: 1 if successful, zero otherwise
+        """
+        sts = integer_to_bytearray(state)
+        pwr = integer_to_bytearray(power)
+        payload = sts + pwr
 
-        self.logger.debug("override TD air pump data broadcast interval")
-
-        # 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 = str(ms) + " ms: "
-            self.logger.debug("Air pump data broadcast interval 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 = 'start with power' if state == 2 else 'stopped'
+        power_value = f'{str(power)}' if state == 2 else ''
+        return cmd_generic_override(
+            payload = payload,
+            reset = NO_RESET,
+            channel_id = DenaliChannels.dialin_to_td_ch_id,
+            msg_id = MsgIds.MSG_ID_TD_AIR_PUMP_SET_STATE_REQUEST,
+            entity_name = f'TD Air Pump to {state_name}',
+            override_text = f'{power_value}',
+            logger = self.logger,
+            can_interface = self.can_interface)