Index: leahi_dialin/ui/td_messaging.py
===================================================================
diff -u -r7e864b8d034f7a5cb961402d4f6672b180a57bb5 -rbe143d6c18a7f971d48130adbe458eaf8547da23
--- leahi_dialin/ui/td_messaging.py	(.../td_messaging.py)	(revision 7e864b8d034f7a5cb961402d4f6672b180a57bb5)
+++ leahi_dialin/ui/td_messaging.py	(.../td_messaging.py)	(revision be143d6c18a7f971d48130adbe458eaf8547da23)
@@ -118,13 +118,16 @@
         self.can_interface.send(message, 0)
 
     def td_air_trap(self, 
-                    H17_state       : int, 
-                    H16_state       : int, 
-                    H17_raw_state   : int, 
-                    H16_raw_state   : int, 
-                    H13_state       : int, 
-                    H20_State       : int, 
-                    controlling     : int):
+                    H17State                 : int,
+                    H16State                 : int,
+                    H17RawState              : int,
+                    H16RawState              : int,
+                    H13State                 : int,
+                    H20State                 : int,
+                    IsAutoControlling        : int,
+                    AirTrapState             : int,
+                    AirPumpLowerPowerLevel   : int,
+                    AirPumpRaisePowerLevel   : int):
         """
         Broadcasts the current TD air trap data(Msg ID: 0x2A, 42)
         Args:
@@ -141,13 +144,16 @@
             raise ValueError("CAN Interface is not enabled")
 
 
-        payload =  conversions.unsigned_integer_to_bytearray(H17_state      )
-        payload += conversions.unsigned_integer_to_bytearray(H16_state      )
-        payload += conversions.unsigned_integer_to_bytearray(H17_raw_state  )
-        payload += conversions.unsigned_integer_to_bytearray(H16_raw_state  )
-        payload += conversions.unsigned_integer_to_bytearray(H13_state      )
-        payload += conversions.unsigned_integer_to_bytearray(H20_State      )
-        payload += conversions.unsigned_integer_to_bytearray(controlling    )
+        payload =  conversions.unsigned_integer_to_bytearray(H17State                )
+        payload += conversions.unsigned_integer_to_bytearray(H16State                )
+        payload += conversions.unsigned_integer_to_bytearray(H17RawState             )
+        payload += conversions.unsigned_integer_to_bytearray(H16RawState             )
+        payload += conversions.unsigned_integer_to_bytearray(H13State                )
+        payload += conversions.unsigned_integer_to_bytearray(H20State                )
+        payload += conversions.unsigned_integer_to_bytearray(IsAutoControlling       )
+        payload += conversions.unsigned_integer_to_bytearray(AirTrapState            )
+        payload += conversions.unsigned_integer_to_bytearray(AirPumpLowerPowerLevel  )
+        payload += conversions.unsigned_integer_to_bytearray(AirPumpRaisePowerLevel  )
 
         message = CAN.CanMessage.build_message(
                                             channel_id=CAN.CanChannels.td_sync_broadcast_ch_id,
@@ -179,8 +185,11 @@
         
         self.can_interface.send(message, 0)
         
-    def td_air_pump(self, H12_state  : int, 
-                          H12_power  : int):
+    def td_air_pump(self, H12_state         : int, 
+                          H12_rpm           : int,
+                          H12_power         : float,
+                          H12_fpga_rpm      : int,
+                          H12_scalar_power  : int):
         """
         Broadcasts the current TD Air Pump data (Msg ID: 0x20, 32)
         Args:
@@ -192,8 +201,11 @@
             raise ValueError("CAN Interface is not enabled")
 
 
-        payload =  conversions.unsigned_integer_to_bytearray(H12_state)
-        payload += conversions.unsigned_integer_to_bytearray(H12_power)
+        payload =  conversions.unsigned_integer_to_bytearray(H12_state        )
+        payload += conversions.unsigned_integer_to_bytearray(H12_rpm          )
+        payload += conversions.float_to_bytearray           (H12_power        )
+        payload += conversions.unsigned_integer_to_bytearray(H12_fpga_rpm     )
+        payload += conversions.unsigned_integer_to_bytearray(H12_scalar_power )
 
         message = CAN.CanMessage.build_message(
                                             channel_id=CAN.CanChannels.td_sync_broadcast_ch_id,
@@ -1587,8 +1599,8 @@
         payload += conversions.integer_to_bytearray(vVenousAsymmetricRejectReason   )
         payload += conversions.integer_to_bytearray(vTmpWindowRejectReason          )
 
-        message = CAN.DenaliMessage.build_message(
-                                            channel_id=CAN.DenaliChannels.td_to_ui_ch_id,
+        message = CAN.CanMessage.build_message(
+                                            channel_id=CAN.CanChannels.td_to_ui_ch_id,
                                             message_id=msg_ids.MsgIds.MSG_ID_TD_PRESSURE_LIMITS_CHANGE_RESPONSE.value,
                                             payload=payload)
         self.can_interface.send(message, 0)
@@ -1623,8 +1635,8 @@
         payload += conversions.integer_to_bytearray(vSodiumRejectReason                 )
         payload += conversions.integer_to_bytearray(vBicarbonateRejectReason            )
 
-        message = CAN.DenaliMessage.build_message(
-                                            channel_id=CAN.DenaliChannels.td_to_ui_ch_id,
+        message = CAN.CanMessage.build_message(
+                                            channel_id=CAN.CanChannels.td_to_ui_ch_id,
                                             message_id=msg_ids.MsgIds.MSG_ID_TD_TREATMENT_SET_POINTS_CHANGE_RESPONSE.value,
                                             payload=payload)
         self.can_interface.send(message, 0)
@@ -1640,8 +1652,8 @@
         payload  = conversions.integer_to_bytearray(vAccepted)
         payload += conversions.integer_to_bytearray(vRejectionReason)
     
-        message = CAN.DenaliMessage.build_message(
-                                            channel_id=CAN.DenaliChannels.td_to_ui_ch_id,
+        message = CAN.CanMessage.build_message(
+                                            channel_id=CAN.CanChannels.td_to_ui_ch_id,
                                             message_id=msg_ids.MsgIds.MSG_ID_TD_ADJUST_PATIENT_DISCONNECT_CONFIRM_RESPONSE.value,
                                             payload=payload)
         self.can_interface.send(message, 0)