Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rc2e547d07b8fdadafd2cee283c77a10ff06ebcfa -r1a685471524555a374854c0c9ec8e208e71fe2df
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision c2e547d07b8fdadafd2cee283c77a10ff06ebcfa)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 1a685471524555a374854c0c9ec8e208e71fe2df)
@@ -8,7 +8,7 @@
 * @file SystemCommMessages.h
 *
 * @author (last) Sean Nash
-* @date (last) 28-Aug-2020
+* @date (last) 14-Oct-2020
 *
 * @author (original) Dara Navaei
 * @date (original) 05-Nov-2019
@@ -19,6 +19,7 @@
 #define __SYSTEM_COMM_MESSAGES_H__
 
 #include "HDCommon.h"
+#include "AirTrap.h"
 #include "BloodFlow.h"
 #include "DGInterface.h"
 #include "DialInFlow.h"
@@ -209,6 +210,9 @@
 // MSG_ID_SALINE_BOLUS_DATA
 BOOL broadcastSalineBolusData( SALINE_BOLUS_DATA_PAYLOAD_T data );
 
+// 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 );
@@ -366,6 +370,9 @@
 // MSG_ID_HD_DIALYSATE_FLOW_SET_CALIBRATION:
 void handleSetDialysateFlowCalibration( MESSAGE_T *message );
 
+// MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER
+void handleTestSetTreatmentParameter( MESSAGE_T *message );
+
 // MSG_ID_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE
 void handleTestHDValvesBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
@@ -398,6 +405,12 @@
 // MSG_ID_DIAL_OUT_PUMP_HOME_CMD
 void handleTestDialOutPumpHomeRequest( 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 );
+
 /**@}*/
 
 #endif