Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r2cc4f0cfc6512c942864d7d302cef5df375a2081 -r70b000b9a49b56f1e5d41aebddf4ed97a01faa0b
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 2cc4f0cfc6512c942864d7d302cef5df375a2081)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 70b000b9a49b56f1e5d41aebddf4ed97a01faa0b)
@@ -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
@@ -20,9 +20,9 @@
 #include "reg_system.h"
 
 #include "Accel.h"
-#include "AlarmLamp.h"
+#include "AlarmLamp.h"
 #include "Buttons.h"
-#include "DGInterface.h"
+#include "DGInterface.h"
 #include "FPGA.h"
 #include "ModePreTreat.h"
 #include "ModeStandby.h"
@@ -1434,6 +1434,35 @@
 
 /***********************************************************************//**
  * @brief
+ * The broadcastBloodLeakState function constructs an HD blood leak state msg to \n
+ * be broadcasted and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: blood leak state msg constructed and queued
+ * @param state blood leak state
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastBloodLeakState( BLOOD_LEAK_STATES_T state )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+    U32 leakState = (U32)state;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_BLOOD_LEAK_STATE;
+    msg.hdr.payloadLen = sizeof( U32 );
+
+    memcpy( payloadPtr, &leakState, 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
@@ -4231,6 +4260,70 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleSetBloodLeakBroadcastIntervalOverrideRequest function handles a
+ * request to override the blood leak state broadcast interval.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleSetBloodLeakBroadcastIntervalOverrideRequest( 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 = testSetBloodLeakStatePublishIntervalOverride( (U32)( payload.state.u32 ) );
+        }
+        else
+        {
+            result = testResetBloodLeakStatePublishIntervalOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleSetBloodLeakStateDetectorOverrideRequest function handles a request to
+ * override the blood leak detector state.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleSetBloodLeakStateDetectorOverrideRequest( 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 = testSetBloodLeakStateOverride( ( BLOOD_LEAK_STATES_T)( payload.state.u32 ) );
+        }
+        else
+        {
+            result = testResetBloodLeakStateOverride();
+        }
+    }
+
+    // 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