Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r0994065cce7875df917e6f96e7a0b78109980752 -r6cd114c4deffb81e85c6cd3ebaf550fe4661efda
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 0994065cce7875df917e6f96e7a0b78109980752)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6cd114c4deffb81e85c6cd3ebaf550fe4661efda)
@@ -7,8 +7,8 @@
 *
 * @file SystemCommMessages.c
 *
-* @author (last) Sean Nash
-* @date (last) 14-Oct-2020
+* @author (last) Peman Montazemi
+* @date (last) 18-Mar-2021
 *
 * @author (original) Dara Navaei
 * @date (original) 05-Nov-2019
@@ -2005,6 +2005,38 @@
 
 /***********************************************************************//**
  * @brief
+ * The broadcastBloodLeakData function constructs an HD blood leak data msg to \n
+ * be broadcasted and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: blood leak data msg constructed and queued
+ * @param status blood leak status
+ * @param state blood leak state
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastBloodLeakData( BLOOD_LEAK_STATUS_T status, U32 state )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+    U32 leakStatus = (U32)status;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_BLOOD_LEAK_DATA;
+    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 );
+
+    memcpy( payloadPtr, &leakStatus, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &state, 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
@@ -4887,14 +4919,14 @@
 
 /*********************************************************************//**
  * @brief
- * The handleSetFluidLeakStateDetectorOverrideRequest function handles a request to
+ * The handleSetFluidLeakStateOverrideRequest function handles a request to
  * override the fluid leak detector state.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleSetFluidLeakStateDetectorOverrideRequest( MESSAGE_T *message )
+void handleSetFluidLeakStateOverrideRequest( MESSAGE_T *message )
 {
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
@@ -4919,6 +4951,94 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleSetBloodLeakDataBroadcastIntervalOverrideRequest function handles a
+ * request to override the blood leak data broadcast interval.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleSetBloodLeakDataBroadcastIntervalOverrideRequest( 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 = testSetBloodLeakDataPublishIntervalOverride( (U32)( payload.state.u32 ) );
+        }
+        else
+        {
+            result = testResetBloodLeakDataPublishIntervalOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleSetBloodLeakStatusOverrideRequest function handles a request to
+ * override the blood leak detector status.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleSetBloodLeakStatusOverrideRequest( 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 = testSetBloodLeakStatusOverride( (BLOOD_LEAK_STATUS_T)( payload.state.u32 ) );
+        }
+        else
+        {
+            result = testResetBloodLeakStatusOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleBloodLeakZeroRequest function handles a request to
+ * zero the blood leak detector.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleBloodLeakZeroRequest( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( 0 == message->hdr.payloadLen )
+    {
+        result = TRUE;
+        zeroBloodLeak();
+    }
+
+    // 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