Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r065601bf5b0fc1b31b10ab54c2711875923c369a -r17c70da53b1ba89efe3a51f682213ec00b4b9681
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 065601bf5b0fc1b31b10ab54c2711875923c369a)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 17c70da53b1ba89efe3a51f682213ec00b4b9681)
@@ -159,8 +159,9 @@
             break;
 
         case POST_STATE_ALARM_AUDIO:
-            testStatus = execAlarmAudioSelfTest();
-            postState = handlePOSTStatus( testStatus );
+//            testStatus = execAlarmAudioSelfTest();
+//            postState = handlePOSTStatus( testStatus );
+            postState = POST_STATE_ALARM_LAMP;
             break;
 
         case POST_STATE_ALARM_LAMP:
@@ -219,7 +220,6 @@
             // Should not get here - any failed post test should have already triggered a fault and taken us to fault mode
         default:
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_INIT_POST_INVALID_POST_STATE, postState )
-            postState = POST_STATE_FAILED;
             break;
     }
 
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r793769afaa008c10c04f527c75c2feed850f15c3 -r17c70da53b1ba89efe3a51f682213ec00b4b9681
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 793769afaa008c10c04f527c75c2feed850f15c3)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 17c70da53b1ba89efe3a51f682213ec00b4b9681)
@@ -494,7 +494,7 @@
             break;
 
         default:
-            // TODO - s/w fault?
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_USER_ACTION, action );
             break;
     }
 }
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r793769afaa008c10c04f527c75c2feed850f15c3 -r17c70da53b1ba89efe3a51f682213ec00b4b9681
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 793769afaa008c10c04f527c75c2feed850f15c3)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 17c70da53b1ba89efe3a51f682213ec00b4b9681)
@@ -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
@@ -23,14 +23,10 @@
 #include "AlarmLamp.h"
 #include "Buttons.h"
 #include "ConsumableSelfTest.h"
-#include "DGInterface.h"
 #include "FPGA.h"
-#include "ModePreTreat.h"
 #include "ModeStandby.h"
-#include "ModeTreatment.h"
 #include "ModeTreatmentParams.h"
 #include "OperationModes.h"
-#include "PresOccl.h"
 #include "RTC.h"
 #include "SampleWater.h"
 #include "SafetyShutdown.h"
@@ -39,7 +35,6 @@
 #include "TreatmentEnd.h"
 #include "TreatmentRecirc.h"
 #include "Utilities.h"
-#include "Valves.h"
 #include "WatchdogMgmt.h"
 
 /**
@@ -575,7 +570,108 @@
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED );
 
     return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handlePatientDisconnectionConfirmCmd function handles user confirms
+ * patient disconnection.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none.
+ *************************************************************************/
+void handlePatientDisconnectionConfirmCmd( MESSAGE_T *message )
+{
+    if ( 0 == message->hdr.payloadLen )
+    {
+        signalUserConfirmPatientDisconnection();
+    }
+
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
 }
+
+/*********************************************************************//**
+ * @brief
+ * The handleDisposableRemovalConfirmCmd function handles user confirms
+ * disposable removal.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none.
+ *************************************************************************/
+void handleDisposableRemovalConfirmCmd( MESSAGE_T *message )
+{
+    if ( 0 == message->hdr.payloadLen )
+    {
+        signalUserConfirmDisposableRemoval();
+    }
+
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The sendDisposableRemovalConfirmResponse function constructs a disposable
+ * removal confirm user action response to the UI and queues the msg for
+ * transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: Disposable removal confirm response msg constructed and queued.
+ * @param accepted T/F - was disposable removal confirm request accepted?
+ * @param reason reason why request was rejected (or zero if accepted)
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendDisposableRemovalConfirmResponse( BOOL accepted, U32 reason )
+{
+    return sendUIResponseMsg( MSG_ID_HD_DISPOSABLE_REMOVAL_CONFIRM_RESPONSE, accepted, reason );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleUITreatmentLogDataRequest function handles UI treatment log data request.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none.
+ *************************************************************************/
+void handleUITreatmentLogDataRequest( MESSAGE_T *message )
+{
+    if ( 0 == message->hdr.payloadLen )
+    {
+        handleTreatmentLogDataRequest();
+    }
+
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The sendTreatmentLogData function constructs a treatment log data message
+ * for UI and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: Treatment log data msg constructed and queued.
+ * @param logDataPtr treatment log data record pointer
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendTreatmentLogData( BOOL accepted, U32 reason, TREATMENT_LOG_DATA_PAYLOAD_T *logDataPtr )
+{
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE;
+    msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( U32 ) + sizeof( TREATMENT_LOG_DATA_PAYLOAD_T );
+
+    memcpy( payloadPtr, &accepted, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &reason, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, logDataPtr, sizeof( TREATMENT_LOG_DATA_PAYLOAD_T ) );
+
+    // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+    return serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED );
+}
 
 /*********************************************************************//**
  * @brief
@@ -1639,6 +1735,30 @@
 
 /*********************************************************************//**
  * @brief
+ * The broadcastPostTreatmentState function constructs a post treatment state msg
+ * to be broadcast and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: post-treatment state msg constructed and queued
+ * @param postTreatmentSubMode post-treatment state sub-mode
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastPostTreatmentState( U32 postTreatmentSubMode )
+{
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_POST_TREATMENT_STATE;
+    msg.hdr.payloadLen = sizeof( U32 );
+
+    memcpy( payloadPtr, &postTreatmentSubMode, sizeof( U32 ) );
+
+    // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+    return serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_BROADCAST, ACK_NOT_REQUIRED );
+}
+
+/*********************************************************************//**
+ * @brief
  * The broadcastPreTreatmentState function constructs a pre-treatment state msg to
  * be broadcast and queues the msg for transmit on the appropriate CAN channel.
  * @details Inputs: none
@@ -2019,6 +2139,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
@@ -3328,7 +3480,6 @@
     /*********************************************************************//**
      * @brief
      * The sendDebugDataToUI function sends debug string to the UI for logging.
-     * @details
      * @details Inputs: none
      * @details Outputs: Message constructed and queued for transmit
      * @param str Pointer to debug string
@@ -5048,15 +5199,79 @@
 
 /*********************************************************************//**
  * @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_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 = testSetFluidLeakStateOverride( ( FLUID_LEAK_STATES_T)( payload.state.u32 ) );
+        }
+        else
+        {
+            result = testResetFluidLeakStateOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @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;
 
@@ -5066,11 +5281,11 @@
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
-            result = testSetFluidLeakStateOverride( ( FLUID_LEAK_STATES_T)( payload.state.u32 ) );
+            result = testSetBloodLeakStatusOverride( (BLOOD_LEAK_STATUS_T)( payload.state.u32 ) );
         }
         else
         {
-            result = testResetFluidLeakStateOverride();
+            result = testResetBloodLeakStatusOverride();
         }
     }
 
@@ -5080,6 +5295,30 @@
 
 /*********************************************************************//**
  * @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
@@ -5716,6 +5955,40 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleTestValvesCurrentOverrideRequest function handles a
+ * request to override HD valves' current.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestValvesCurrentOverrideRequest( 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 = testSetValvesCurrentOverride( payload.index, payload.state.f32 );
+        }
+        else
+        {
+            result = testResetValvesCurrentOverride( payload.index );
+        }
+
+        result = testSetValvesCurrentOverride( payload.index, payload.state.f32 );
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleTestAlarmInfoSendIntervalOverrideRequest function handles a
  * request to override the HD alarm information broadcast interval.
  * @details Inputs: none
@@ -5997,7 +6270,36 @@
             result = testResetSyringePumpADCReadCounter();
         }
     }
+}
 
+/*********************************************************************//**
+ * @brief
+ * The handleTestValvesPositionCountOverrideRequest function handles a
+ * request to override HD valves' position in counts.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestValvesPositionCountOverrideRequest( 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 = testSetValvesPositionCountOverride( payload.index, payload.state.u32 );
+        }
+        else
+        {
+            result = testResetValvesPositionCountOverride( payload.index );
+        }
+    }
+
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }