Index: leahi_dialin/td/modules/pressure_sensors.py
===================================================================
diff -u -rc8f8cbb3230e40988847f33e9701714939462c93 -rc3153b8411388a9318d827ae42e830627cebc220
--- leahi_dialin/td/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision c8f8cbb3230e40988847f33e9701714939462c93)
+++ leahi_dialin/td/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision c3153b8411388a9318d827ae42e830627cebc220)
@@ -16,12 +16,12 @@
 import struct
 from logging import Logger
 
-from .constants import RESET, NO_RESET
+from leahi_dialin.common.constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.td_defs import TDPressureSensorNames, TDPressureSensorAttributes
-from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
+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.checks import check_broadcast_interval_override_ms
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
 
 
@@ -127,6 +127,7 @@
         self.td_pressure_sensors[TDPressureSensorNames.H23_PRES.name][TDPressureSensorAttributes.PRES.name] = baro[0]
         self.td_pressure_timestamp = timestamp
 
+
     def cmd_pressure_sensor_override(self, sensor: int, pressure: float,  reset: int = NO_RESET) -> int:
         """
         Constructs and sends the measured pressure sensor override command
@@ -140,34 +141,53 @@
         @return: 1 if successful, zero otherwise
         """
 
+        sensor_name = TDPressureSensorNames(sensor).name.split('_')[0]
+
         rst = integer_to_bytearray(reset)
         sen = integer_to_bytearray(sensor)
         prs = float_to_bytearray(pressure)
         payload = rst + prs + sen
 
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id,
-                                              message_id=MsgIds.MSG_ID_TD_PRESSURE_OVERRIDE_REQUEST.value,
-                                              payload=payload)
+        return cmd_generic_override(
+            payload = payload,
+            reset = reset,
+            channel_id = DenaliChannels.dialin_to_td_ch_id,
+            msg_id = MsgIds.MSG_ID_TD_PRESSURE_OVERRIDE_REQUEST,
+            entity_name = f'{sensor_name} pressure',
+            override_text = str(prs) + " mmHg.  ",
+            logger = self.logger,
+            can_interface = self.can_interface
+        )
 
-        self.logger.debug("override pressure sensor")
 
-        # Send message
-        received_message = self.can_interface.send(message)
+    def cmd_tmp_sensor_override(self, pressure: float,  reset: int = NO_RESET) -> int:
+        """
+        Constructs and sends the tmp sensor override command
+    .
+        Constraints:
+            Must be logged into TD.
 
-        # If there is content...
-        if received_message is not None:
-            if reset == RESET:
-                str_res = "reset back to normal.  "
-            else:
-                str_res = str(prs) + " mmHg.  "
-            self.logger.debug("pressure (measured)) 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
+        @param pressure:  float - measured pressure (in mmHg) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
+        """
 
+        rst = integer_to_bytearray(reset)
+        prs = float_to_bytearray(pressure)
+        payload = rst + prs
+
+        return cmd_generic_override(
+            payload = payload,
+            reset = reset,
+            channel_id = DenaliChannels.dialin_to_td_ch_id,
+            msg_id = MsgIds.MSG_ID_TD_TMP_PRESSURE_OVERRIDE_REQUEST,
+            entity_name = 'TMP pressure',
+            override_text = str(prs) + " mmHg.  ",
+            logger = self.logger,
+            can_interface = self.can_interface
+        )
+
+
     def cmd_pressure_sensors_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the measured pressure sensors broadcast interval override command
@@ -180,33 +200,11 @@
         @return: 1 if successful, zero otherwise
         """
 
-        if not check_broadcast_interval_override_ms(ms):
-            return False
-
-        rst = integer_to_bytearray(reset)
-        mis = integer_to_bytearray(ms)
-        payload = rst + mis
-
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id,
-                                              message_id=MsgIds.MSG_ID_TD_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value,
-                                              payload=payload)
-
-        self.logger.debug("override pressure sensors broadcast interval")
-
-        # Send message
-        received_message = self.can_interface.send(message)
-
-        # If there is content...
-        if received_message is not None:
-            # self.logger.debug(received_message)
-            if reset == RESET:
-                str_res = "reset back to normal: "
-            else:
-                str_res = str(ms) + " ms: "
-            self.logger.debug("Pressure sensors 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
\ No newline at end of file
+        return cmd_generic_broadcast_interval_override(
+            ms = ms,
+            reset = reset,
+            channel_id = DenaliChannels.dialin_to_td_ch_id,
+            msg_id = MsgIds.MSG_ID_TD_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
+            module_name = 'TD pressure sensors',
+            logger = self.logger,
+            can_interface = self.can_interface)