Index: leahi_dialin/dd/modules/pressure_sensors.py
===================================================================
diff -u -r35e8d930cb1a45457de87d93728fe60c7cb10ab5 -r0bdafdb1821e164a8416ea4b47be946f13239b5a
--- leahi_dialin/dd/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 35e8d930cb1a45457de87d93728fe60c7cb10ab5)
+++ leahi_dialin/dd/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 0bdafdb1821e164a8416ea4b47be946f13239b5a)
@@ -7,22 +7,22 @@
 #
 # @file    pressure_sensors.py
 #
-# @author  (last)      Micahel Garthwaite
-# @date    (last)      07-Mar-2023
+# @author  (last)      Zoltan Miskolci
+# @date    (last)      07-Jan-2026
 # @author  (original)  Sean
 # @date    (original)  14-Apr-2020
 #
 ############################################################################
+
 import struct
-from enum import unique
 from logging import Logger
 
-from .constants import NO_RESET, RESET
-from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
+from leahi_dialin.common.constants import NO_RESET
 from leahi_dialin.common.dd_defs import DDPressureNames
-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.common.msg_defs import MsgIds, MsgFieldPositions
+from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
+from leahi_dialin.protocols.CAN import DenaliChannels
+from leahi_dialin.utils.base import AbstractSubSystem, publish
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
 
 
@@ -58,6 +58,7 @@
 
         self.dd_pressures_timestamp = 0
 
+
     @publish(["msg_id_dd_pressures_data", "dd_pressures", "dd_pressures_timestamp"])
     def _handler_pressures_sync(self, message,timestamp=0.0):
         """
@@ -80,6 +81,7 @@
 
         self.dd_pressures_timestamp = timestamp
 
+
     def cmd_pressure_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the pressure broadcast interval override command.
@@ -92,31 +94,16 @@
         @return: 1 if successful, zero otherwise
 
         """
+        return cmd_generic_broadcast_interval_override(
+            ms = ms,
+            reset = reset,
+            channel_id = DenaliChannels.dialin_to_dd_ch_id,
+            msg_id = MsgIds.MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
+            module_name = 'DD Pressure Sensors',
+            logger = self.logger,
+            can_interface = self.can_interface)
 
-        if not check_broadcast_interval_override_ms(ms):
-            return False
 
-        rst = integer_to_bytearray(reset)
-        ivl = integer_to_bytearray(ms)
-        payload = rst + ivl
-
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id,
-                                              message_id=MsgIds.MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value,
-                                              payload=payload)
-
-        self.logger.debug("override pressure 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.debug("Timeout!!!!")
-            return False
-
     def cmd_pressure_readings_override(self, sensor: int, pressure: float, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the pressure readings override command.
@@ -134,23 +121,18 @@
         idx = integer_to_bytearray(sensor)
         payload = rst + prs + idx
 
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id,
-                                              message_id=MsgIds.MSG_ID_DD_PRESSURE_SENSOR_READINGS_OVERRIDE_REQUEST.value,
-                                              payload=payload)
+        sensor_name = DDPressureNames(sensor).name.split('_')[0]
+        return cmd_generic_override(
+            payload = payload,
+            reset = reset,
+            channel_id = DenaliChannels.dialin_to_dd_ch_id,
+            msg_id = MsgIds.MSG_ID_DD_PRESSURE_SENSOR_READINGS_OVERRIDE_REQUEST,
+            entity_name = f'DD {sensor_name} Pressure Sensors pressure',
+            override_text = f'{str(pressure)} psi',
+            logger = self.logger,
+            can_interface = self.can_interface)
 
-        self.logger.debug("override pressure reading")
 
-        # 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_pressure_sensor_read_counter_override(self, sensor: int, counter: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the pressure sensor read counter override command
@@ -169,27 +151,18 @@
         sensor_byte_array = integer_to_bytearray(sensor)
         payload = reset_byte_array + read_byte_array + sensor_byte_array
 
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id,
-                                              message_id=MsgIds.MSG_ID_DD_PRESSURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST.value,
-                                              payload=payload)
+        sensor_name = DDPressureNames(sensor).name.split('_')[0]
+        return cmd_generic_override(
+            payload = payload,
+            reset = reset,
+            channel_id = DenaliChannels.dialin_to_dd_ch_id,
+            msg_id = MsgIds.MSG_ID_DD_PRESSURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST,
+            entity_name = f'DD {sensor_name} Pressure Sensors read counter',
+            override_text = str(counter),
+            logger = self.logger,
+            can_interface = self.can_interface)
 
-        if reset == RESET:
-            str_res = "reset back to normal"
-        else:
-            str_res = str(sensor) + " psi"
-        self.logger.debug("override read counter value for pressure sensor " + str(sensor) + ": " + str_res)
 
-        # 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
-
     def cmd_pressure_sensor_error_counter_override(self, sensor: int, counter: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the pressure sensor error counter override command.
@@ -208,27 +181,18 @@
         sensor_byte_array = integer_to_bytearray(sensor)
         payload = reset_byte_array + error_byte_array + sensor_byte_array
 
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id,
-                                              message_id=MsgIds.MSG_ID_DD_PRESSURE_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST.value,
-                                              payload=payload)
+        sensor_name = DDPressureNames(sensor).name.split('_')[0]
+        return cmd_generic_override(
+            payload = payload,
+            reset = reset,
+            channel_id = DenaliChannels.dialin_to_dd_ch_id,
+            msg_id = MsgIds.MSG_ID_DD_PRESSURE_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST,
+            entity_name = f'DD {sensor_name} Pressure Sensors error counter',
+            override_text = str(counter),
+            logger = self.logger,
+            can_interface = self.can_interface)
 
-        if reset == RESET:
-            str_res = "reset back to normal"
-        else:
-            str_res = str(sensor) + " psi"
-        self.logger.debug("override error counter value for pressure sensor " + str(sensor) + ": " + str_res)
 
-        # 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
-
     def cmd_pressure_filtered_readings_override(self, sensor: int, pressure: float, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the pressure filtered readings override command.
@@ -246,19 +210,13 @@
         idx = integer_to_bytearray(sensor)
         payload = rst + prs + idx
 
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id,
-                                              message_id=MsgIds.MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST.value,
-                                              payload=payload)
-
-        self.logger.debug("override pressure reading")
-
-        # 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
\ No newline at end of file
+        sensor_name = DDPressureNames(sensor).name.split('_')[0]
+        return cmd_generic_override(
+            payload = payload,
+            reset = reset,
+            channel_id = DenaliChannels.dialin_to_dd_ch_id,
+            msg_id = MsgIds.MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST,
+            entity_name = f'DD {sensor_name} Pressure Sensors filtered pressure',
+            override_text = f'{str(pressure)} psi',
+            logger = self.logger,
+            can_interface = self.can_interface)