Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r1463d830cefd58198bfc6d4ae3775ad0f2eb1d0b -rc55d371408bdf962de525a47bc8541d5b43414a3
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 1463d830cefd58198bfc6d4ae3775ad0f2eb1d0b)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c55d371408bdf962de525a47bc8541d5b43414a3)
@@ -33,6 +33,7 @@
 #include "Pressures.h"
 #include "Reservoirs.h"
 #include "RTC.h"
+#include "Switches.h"
 #include "SystemComm.h"
 #include "SafetyShutdown.h"
 #include "SystemCommMessages.h"
@@ -1210,6 +1211,33 @@
 
 /*********************************************************************//**
  * @brief
+ * The broadcastSwitchesData function sends out switches data.
+ * @details Inputs: none
+ * @details Outputs: switches data msg constructed and queued
+ * @param SWITCHES_DATA_T which is switches msg constructed and queued
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastSwitchesData( SWITCHES_DATA_T *switchesData )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_DG_SWITCHES_DATA;
+    msg.hdr.payloadLen = sizeof( SWITCHES_DATA_T );
+
+    memcpy( payloadPtr, switchesData, sizeof( SWITCHES_DATA_T ) );
+
+    // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_UI, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The sendDGSystemRecord function sends out the DG system record.
  * @details Inputs: none
  * @details Outputs: DG system record msg constructed and queued
@@ -2320,6 +2348,70 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*************************************************************************
+ * @brief
+ * The handleSetSwitchesStatusOverrideRequest function handles a
+ * request to override the status of a switch in DG.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleSetSwitchesStatusOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetSwitchesStatusOverride( payload.index, payload.state.u32 );
+        }
+        else
+        {
+            result = testResetSwitchesStatusOverride( payload.index );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*************************************************************************
+ * @brief
+ * The handleTestSwitchesPublishIntervalOverrideRequest function handles a
+ * request to override the the switches data publish interval.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestSwitchesPublishIntervalOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetSwitchesDataPublishIntervalOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetSwitchesDataPublishIntervalOverrid();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleTestDGAccelOverrideRequest function handles a request to