Index: leahi_dialin/dd/modules/pressure_sensors.py
===================================================================
diff -u -r40186f183b0331f4c76c24c1e5385539ce603402 -r71975b0c600fd9bd4b2a43cc707e6b0a2012f8b0
--- leahi_dialin/dd/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 40186f183b0331f4c76c24c1e5385539ce603402)
+++ leahi_dialin/dd/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 71975b0c600fd9bd4b2a43cc707e6b0a2012f8b0)
@@ -13,17 +13,17 @@
 # @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.constants import NO_RESET, RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.dd_defs import dd_enum_repository
 from leahi_dialin.common.global_vars import GlobalVariables
+from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override
 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.base import AbstractSubSystem, publish
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
 
 
@@ -103,30 +103,15 @@
 
         """
 
-        if not check_broadcast_interval_override_ms(ms):
-            return False
+        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)
 
-        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.
@@ -161,45 +146,6 @@
             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
-        Constraints:
-            Must be logged into DD.
-
-        @param sensor: unsigned int - sensor ID
-        @param counter:  integer - read count to override sensor with
-        @param reset:  integer - 1 to reset a previous override, 0 to override
-        @return: 1 if successful, zero otherwise
-
-        """
-
-        reset_byte_array = integer_to_bytearray(reset)
-        read_byte_array = integer_to_bytearray(counter)
-        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)
-
-        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.