Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -ra35d5e68aad457339f625848809207a9650ad019 -rd9d085cdca67200ecddbdfbc75c489e704b23081
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision a35d5e68aad457339f625848809207a9650ad019)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision d9d085cdca67200ecddbdfbc75c489e704b23081)
@@ -18,10 +18,11 @@
 #ifndef __SYSTEM_COMM_MESSAGES_H__
 #define __SYSTEM_COMM_MESSAGES_H__
 
-#include "HDCommon.h"
-#include "MsgQueues.h"
-#include "DialOutFlow.h"
+#include "HDCommon.h"
+#include "AirTrap.h"
 #include "DGInterface.h"
+#include "DialOutFlow.h"
+#include "MsgQueues.h"
 #include "Valves.h"
 
 /**
@@ -194,9 +195,9 @@
 // MSG_ID_HD_VALVES_DATA
 BOOL broadcastHDValves( HD_VALVE_DATA_T *valveData );
 
-// MSG_ID_TEMP_FAST_HD_VALVES_REMOVE_LATER
-BOOL broadcastFastTempHDValves(); //TODO remove this function
-
+// MSG_ID_HD_AIR_TRAP_DATA
+BOOL broadcastAirTrapData( AIR_TRAP_LEVELS_T lowerLevel, AIR_TRAP_LEVELS_T upperLevel );
+
 #ifdef EMC_TEST_BUILD
 // MSG_ID_CAN_ERROR_COUNT
 BOOL broadcastCANErrorCount( U32 count );
@@ -365,6 +366,12 @@
 
 // MSG_ID_HD_VALVES_SET_PWM_OVERRIDE
 void handleSetHDValvePWMOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_AIR_TRAP_SEND_INTERVAL_OVERRIDE
+void handleSetAirTrapBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_AIR_TRAP_LEVEL_SENSOR_OVERRIDE
+void handleSetAirTrapLevelSensorOverrideRequest( MESSAGE_T *message );
 
 /**@}*/