Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r6cd114c4deffb81e85c6cd3ebaf550fe4661efda -r276c2634eab5a641ed7f0a548b31e1bb13ef5477
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6cd114c4deffb81e85c6cd3ebaf550fe4661efda)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 276c2634eab5a641ed7f0a548b31e1bb13ef5477)
@@ -2037,6 +2037,41 @@
 
 /***********************************************************************//**
  * @brief
+ * The broadcastBubblesData function constructs an HD air bubble data msg to \n
+ * be broadcasted and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: air bubbles data msg constructed and queued
+ * @param status air bubbles status
+ * @param state air bubbles states
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastBubblesData( U32 statusADA, U32 stateADA, U32 statusADV, U32 stateADV )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_BUBBLES_DATA;
+    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 );
+
+    memcpy( payloadPtr, &statusADA, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &stateADA, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &statusADV, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &stateADV, sizeof( U32 ) );
+
+    // 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_HD_BROADCAST, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
+/***********************************************************************//**
+ * @brief
  * The broadcastPrimeData function constructs a prime data msg to \n
  * be broadcast and queues the msg for transmit on the appropriate CAN channel.
  * @details Inputs: none
@@ -5039,6 +5074,96 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleSetBubblesDataBroadcastIntervalOverrideRequest function handles a
+ * request to override the air bubble detectors data broadcast interval.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleSetBubblesDataBroadcastIntervalOverrideRequest( 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 = testSetBubblesDataPublishIntervalOverride( (U32)( payload.state.u32 ) );
+        }
+        else
+        {
+            result = testResetBubblesDataPublishIntervalOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleSetBubbleStatusOverrideRequest function handles a request to
+ * override a given air bubble detector status.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleSetBubbleStatusOverrideRequest( 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 = testSetBubbleStatusOverride( (BUBBLE_STATUS_T)payload.state.u32, (BUBBLES_T)payload.index );
+        }
+        else
+        {
+            result = testResetBubbleStatusOverride( (BUBBLES_T)payload.index );
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleBubbleSelfTestRequest function handles a request to
+ * self-test a given air bubble detector.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleBubbleSelfTestRequest( MESSAGE_T *message )
+{
+    U32 payload;
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof( U32 ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( U32 ) );
+        result = TRUE;
+        selfTestBubble( (BUBBLES_T)payload );
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleHDSoftwareResetRequest function handles a request to reset the
  * HD firmware processor.
  * @details Inputs: none