Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -re13152777df58456a873789fbfc3f889813109c9
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision e13152777df58456a873789fbfc3f889813109c9)
@@ -7,8 +7,8 @@
 *
 * @file SystemCommMessages.h
 *
-* @author (last) Sean Nash
-* @date (last) 28-Aug-2020
+* @author (last) Dara Navaei
+* @date (last) 02-Oct-2020
 *
 * @author (original) Dara Navaei
 * @date (original) 05-Nov-2019
@@ -18,10 +18,12 @@
 #ifndef __SYSTEM_COMM_MESSAGES_H__
 #define __SYSTEM_COMM_MESSAGES_H__
 
-#include "HDCommon.h"
-#include "MsgQueues.h"
-#include "DialOutFlow.h"
-#include "DGInterface.h"
+#include "HDCommon.h"
+#include "AirTrap.h"
+#include "DGInterface.h"
+#include "DialOutFlow.h"
+#include "MsgQueues.h"
+#include "Valves.h"
 
 /**
  *  @defgroup SystemCommMessages SystemCommMessages
@@ -188,8 +190,14 @@
 BOOL broadcastPowerOffWarning( void );
 
 // MSG_ID_HD_OP_MODE
-BOOL broadcastHDOperationMode( U32 mode, U32 subMode );
-
+BOOL broadcastHDOperationMode( U32 mode, U32 subMode );
+
+// MSG_ID_HD_VALVES_DATA
+BOOL broadcastHDValves( HD_VALVE_DATA_T *valveData );
+
+// 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 );
@@ -343,7 +351,33 @@
 
 // MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER
 void handleTestSetTreatmentParameter( MESSAGE_T *message );
-
+
+// MSG_ID_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE
+void handleTestHDValvesBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_HOME_VALVE
+void handleHomeHDValve( MESSAGE_T *message );
+
+// MSG_ID_HD_VALVES_SET_AIR_TRAP_VALVE
+void handleSetAirTrapValve( MESSAGE_T *message );
+
+// MSG_ID_HD_VALVES_SET_POSITION
+void handleSetHDValvePositionOverrideRequest( MESSAGE_T *message );
+
+#ifdef DEBUG_ENABLED
+// MSG_ID_HD_VALVES_SET_PWM_OVERRIDE
+void handleSetHDValvePWMOverrideRequest( MESSAGE_T *message );
+#endif
+
+// 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 );
+
+// MSG_ID_HD_SOFTWARE_RESET_REQUEST
+void handleHDSoftwareResetRequest( MESSAGE_T *message );
+
 /**@}*/
 
 #endif