Index: leahi_dialin/td/modules/air_trap.py
===================================================================
diff -u -r52aa7af16b98730ba59fc2577dbe8f73b5959775 -r43fec7787f9a4115d19deeb5cbc1d7bbf23134fe
--- leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision 52aa7af16b98730ba59fc2577dbe8f73b5959775)
+++ leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision 43fec7787f9a4115d19deeb5cbc1d7bbf23134fe)
@@ -48,8 +48,8 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.td_sync_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_TD_AIR_TRAP_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
+            self.msg_id_td_air_trap_data = MsgIds.MSG_ID_TD_AIR_TRAP_DATA.value
+            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_air_trap_data,
                                                                        self._handler_air_trap_sync)
 
         self.air_trap_level_sensors = {
@@ -69,10 +69,11 @@
         self.air_control = 0
         self.td_air_trap_timestamp = 0.0
 
-    @publish(["td_air_trap_timestamp",
+    @publish(["msg_id_td_air_trap_data",
               "air_trap_level_sensors",
               "air_trap_valve_states",
-              "air_control"])
+              "air_control",
+              "td_air_trap_timestamp"])
     def _handler_air_trap_sync(self, message, timestamp=0.0):
         """
         Handles published air trap data messages.  Air trap data are captured
@@ -271,4 +272,78 @@
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
         else:
             self.logger.debug("timeout!!")
-            return False
\ No newline at end of file
+            return False
+
+    def cmd_air_trap_air_pump_power_raise_override(self, power: int, reset: int = NO_RESET) -> int:
+        """
+        Constructs and sends the air trap air pump power raise override command
+        Constraints:
+            Must be logged into TD.
+            Given interval must be non-zero and a multiple of the TD general task interval (50 ms).
+
+        @param power:  integer - power to override the level raise to it
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
+        """
+        rst = integer_to_bytearray(reset)
+        pwr = integer_to_bytearray(power)
+        payload = rst + pwr
+
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id,
+                                              message_id=MsgIds.MSG_ID_TD_AIR_PUMP_POWER_RAISE_OVERRIDE_REQUEST.value,
+                                              payload=payload)
+
+        self.logger.debug("Override TD air trap air pump raise power level")
+        # 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(power)
+            self.logger.debug("Air trap air pump power raise 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_air_trap_air_pump_power_lower_override(self, power: int, reset: int = NO_RESET) -> int:
+        """
+        Constructs and sends the air trap air pump power lower override command
+        Constraints:
+            Must be logged into TD.
+            Given interval must be non-zero and a multiple of the TD general task interval (50 ms).
+
+        @param power:  integer - power to override the level lower to it
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
+        """
+        rst = integer_to_bytearray(reset)
+        pwr = integer_to_bytearray(power)
+        payload = rst + pwr
+
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id,
+                                              message_id=MsgIds.MSG_ID_TD_AIR_PUMP_POWER_LOWER_OVERRIDE_REQUEST.value,
+                                              payload=payload)
+
+        self.logger.debug("Override TD air trap air pump lower power level")
+        # 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(power)
+            self.logger.debug("Air trap air pump power lower 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