Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r6d05f4b1484a9271d8cf3b529dbb7e5080e7c954 -r92138116199dca3bdefe4f8e872916ea805a5d3a
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 6d05f4b1484a9271d8cf3b529dbb7e5080e7c954)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 92138116199dca3bdefe4f8e872916ea805a5d3a)
@@ -1273,7 +1273,7 @@
     HD_FLOW_SENSORS_CAL_RECORD_T cal = getHDFlowSensorsCalibrationRecord();
 
     // Retrieve blood flow sensor calibration data and check for sensor connected status
-    if ( BFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGABloodFlowMeterStatus() )
+    if ( BFM_SENSOR_PARAM_CORRUPT_STATUS != bfmStatus )
     {
         bloodFlowCalGain   = cal.hdFlowSensors[ CAL_DATA_HD_BLOOD_FLOW_SENSOR ].gain;
         bloodFlowCalOffset = cal.hdFlowSensors[ CAL_DATA_HD_BLOOD_FLOW_SENSOR ].offset;
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r6d05f4b1484a9271d8cf3b529dbb7e5080e7c954 -r92138116199dca3bdefe4f8e872916ea805a5d3a
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6d05f4b1484a9271d8cf3b529dbb7e5080e7c954)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 92138116199dca3bdefe4f8e872916ea805a5d3a)
@@ -1261,6 +1261,18 @@
             handleTreatmentEndCmd( message );
             break;
 
+        case MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM:
+            handlePatientDisconnectionConfirmCmd( message );
+            break;
+
+        case MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM:
+            handleDisposableRemovalConfirmCmd( message );
+            break;
+
+        case MSG_ID_UI_TREATMENT_LOG_DATA_REQUEST:
+            handleUITreatmentLogDataRequest( message );
+            break;
+
         case MSG_ID_DG_COMMAND_RESPONSE:
             handleDGCmdResp( message );
             break;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r6d05f4b1484a9271d8cf3b529dbb7e5080e7c954 -r92138116199dca3bdefe4f8e872916ea805a5d3a
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6d05f4b1484a9271d8cf3b529dbb7e5080e7c954)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 92138116199dca3bdefe4f8e872916ea805a5d3a)
@@ -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
@@ -1594,6 +1690,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
@@ -3162,7 +3282,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
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r0994065cce7875df917e6f96e7a0b78109980752 -r92138116199dca3bdefe4f8e872916ea805a5d3a
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 0994065cce7875df917e6f96e7a0b78109980752)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 92138116199dca3bdefe4f8e872916ea805a5d3a)
@@ -37,6 +37,7 @@
 #include "Rinseback.h"
 #include "SyringePump.h"
 #include "Valves.h"
+#include "Voltages.h"
 
 /**
  *  @defgroup SystemCommMessages SystemCommMessages
@@ -172,6 +173,12 @@
 // MSG_ID_HD_HEPARIN_PAUSE_RESUME_RESPONSE
 BOOL sendHeparinCommandResponse( U32 accepted, U32 rejReason );
 
+// MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD
+void handleAlarmAudioVolumeSetCmd( MESSAGE_T *message );
+
+// MSG_ID_HD_ALARM_AUDIO_VOLUME_SET_RESPONSE
+BOOL sendAlarmAudioVolumeSetResponse( U32 accepted, U32 rejReason );
+
 // MSG_ID_UI_SAMPLE_WATER_CMD
 void handleSampleWaterCmd( MESSAGE_T *message );
 
@@ -282,7 +289,10 @@
 BOOL broadcastAccelData( F32 x, F32 y, F32 z, F32 xm, F32 ym, F32 zm, F32 xt, F32 yt, F32 zt );
 
 // MSG_ID_ALARM_STATUS
-BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus );
+BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus );
+
+// MSG_ID_HD_ALARM_INFORMATION
+BOOL broadcastAlarmInfo( ALARM_INFO_PAYLOAD_T data );
 
 // MSG_ID_ALARM_TRIGGERED
 BOOL broadcastAlarmTriggered( U32 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 );
@@ -313,6 +323,9 @@
 
 // MSG_ID_PRESSURE_OCCLUSION_DATA
 BOOL broadcastPresOcclData( PRESSURE_OCCLUSION_DATA_T data );
+
+// MSG_ID_HD_VOLTAGES_DATA
+BOOL broadcastVoltagesData( VOLTAGES_DATA_PAYLOAD_T data );
 
 // MSG_ID_RTC_EPOCH
 BOOL broadcastRTCEpoch( U32 epoch );
@@ -620,6 +633,27 @@
 // MSG_ID_HD_SYRINGE_PUMP_MEASURED_VOLUME_OVERRIDE:
 void handleTestSyringePumpMeasuredVolumeOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_HD_MONITORED_VOLTAGES_SEND_INTERVAL_OVERRIDE
+void handleTestMonitoredVoltagesSendIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_MONITORED_VOLTAGES_OVERRIDE
+void handleTestMonitoredVoltageOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_ALARM_INFO_SEND_INTERVAL_OVERRIDE
+void handleTestAlarmInfoSendIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_ALARM_AUDIO_VOLUME_LEVEL_OVERRIDE
+void handleTestAlarmAudioVolumeOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_ALARM_AUDIO_CURRENT_HG_OVERRIDE
+void handleTestAlarmAudioCurrentHgOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_ALARM_AUDIO_CURRENT_LG_OVERRIDE
+void handleTestAlarmAudioCurrentLgOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_ALARM_BACKUP_AUDIO_CURRENT_OVERRIDE
+void handleTestAlarmBackupAudioCurrentOverrideRequest( MESSAGE_T *message );
+
 /**@}*/
 
 #endif
Index: firmware/HD.dil
===================================================================
diff -u -rf3326a3d0fd2a465a518e31ee578e335db301c27 -r92138116199dca3bdefe4f8e872916ea805a5d3a
--- firmware/HD.dil	(.../HD.dil)	(revision f3326a3d0fd2a465a518e31ee578e335db301c27)
+++ firmware/HD.dil	(.../HD.dil)	(revision 92138116199dca3bdefe4f8e872916ea805a5d3a)
@@ -1,4 +1,4 @@
-# RM46L852PGE 04/14/21 14:13:15
+# RM46L852PGE 04/16/21 19:16:19
 # 
 ARCH=RM46L852PGE
 # 
@@ -5553,10 +5553,10 @@
 DRIVER.ADC.VAR.ADC2_GROUP2_RAM_PARITY_ENA.VALUE=0
 DRIVER.ADC.VAR.ADC1_GROUP1_PIN3_ENABLE.VALUE=0x00000008
 DRIVER.ADC.VAR.ADC1_GROUP0_CHANNEL_TOTAL_TIME.VALUE=0.000000
-DRIVER.ADC.VAR.ADC1_GROUP1_FIFO_SIZE.VALUE=6
+DRIVER.ADC.VAR.ADC1_GROUP1_FIFO_SIZE.VALUE=19
 DRIVER.ADC.VAR.ADC1_GROUP2_DISCHARGE_ENABLE.VALUE=0x00000000
 DRIVER.ADC.VAR.ADC1_GROUP2_SAMPLE_PRESCALER.VALUE=0
-DRIVER.ADC.VAR.ADC1_GROUP1_LENGTH.VALUE=6
+DRIVER.ADC.VAR.ADC1_GROUP1_LENGTH.VALUE=20
 DRIVER.ADC.VAR.ADC2_GROUP1_ID_ENABLE.VALUE=0x00000000
 DRIVER.ADC.VAR.ADC1_GROUP2_CONVERSION_TIME.VALUE=3.271
 DRIVER.ADC.VAR.ADC2_PORT_BIT0_DIR.VALUE=0
@@ -5682,7 +5682,7 @@
 DRIVER.ADC.VAR.ADC2_GROUP2_HW_TRIGGER_SOURCE.VALUE=EVENT
 DRIVER.ADC.VAR.ADC2_GROUP2_ID_ENABLE.VALUE=0x00000000
 DRIVER.ADC.VAR.ADC2_GROUP1_ACTUAL_SAMPLE_TIME.VALUE=387.08
-DRIVER.ADC.VAR.ADC1_GROUP2_LENGTH.VALUE=58
+DRIVER.ADC.VAR.ADC1_GROUP2_LENGTH.VALUE=44
 DRIVER.ADC.VAR.ADC1_GROUP0_BND.VALUE=0
 DRIVER.ADC.VAR.ADC2_GROUP2_CHANNEL_TOTAL_TIME.VALUE=0.000000
 DRIVER.ADC.VAR.ADC2_GROUP2_CONTINUOUS_ENABLE.VALUE=0x00000000
@@ -5701,7 +5701,7 @@
 DRIVER.ADC.VAR.ADC1_GROUP2_PIN5_ENABLE.VALUE=0x00000000
 DRIVER.ADC.VAR.ADC1_GROUP0_PIN23_ENABLE.VALUE=0x00000000
 DRIVER.ADC.VAR.ADC1_GROUP0_PIN15_ENABLE.VALUE=0x00000000
-DRIVER.ADC.VAR.ADC1_GROUP1_BND.VALUE=3
+DRIVER.ADC.VAR.ADC1_GROUP1_BND.VALUE=10
 DRIVER.ADC.VAR.ADC2_GROUP2_PIN13_ENABLE.VALUE=0x00000000
 DRIVER.ADC.VAR.ADC1_GROUP1_PIN19_ENABLE.VALUE=0x00080000
 DRIVER.ADC.VAR.ADC2_PORT_BIT0_DOUT.VALUE=0
Index: firmware/include/adc.h
===================================================================
diff -u -ref0b3f0ec00fadc50f95e0db1a6477fb4b076ea1 -r92138116199dca3bdefe4f8e872916ea805a5d3a
--- firmware/include/adc.h	(.../adc.h)	(revision ef0b3f0ec00fadc50f95e0db1a6477fb4b076ea1)
+++ firmware/include/adc.h	(.../adc.h)	(revision 92138116199dca3bdefe4f8e872916ea805a5d3a)
@@ -240,7 +240,7 @@
 #define ADC1_G1SRC_CONFIGVALUE 			((uint32)0x00000000U | (uint32)ADC1_EVENT)
 #define ADC1_G2SRC_CONFIGVALUE 			((uint32)0x00000000U | (uint32)ADC1_EVENT)
 
-#define ADC1_BNDCR_CONFIGVALUE			((uint32)((uint32)0U << 16U)|(0U + 3U))
+#define ADC1_BNDCR_CONFIGVALUE			((uint32)((uint32)0U << 16U)|(0U + 10U))
 #define ADC1_BNDEND_CONFIGVALUE			(2U)
 
 #define ADC1_G0SAMP_CONFIGVALUE			(0U)
Index: firmware/source/adc.c
===================================================================
diff -u -rf3326a3d0fd2a465a518e31ee578e335db301c27 -r92138116199dca3bdefe4f8e872916ea805a5d3a
--- firmware/source/adc.c	(.../adc.c)	(revision f3326a3d0fd2a465a518e31ee578e335db301c27)
+++ firmware/source/adc.c	(.../adc.c)	(revision 92138116199dca3bdefe4f8e872916ea805a5d3a)
@@ -86,7 +86,7 @@
     adcREG1->CLOCKCR = 25U;
  
     /** - Setup memory boundaries */
-    adcREG1->BNDCR  = (uint32)((uint32)0U << 16U) | (0U + 3U);
+    adcREG1->BNDCR  = (uint32)((uint32)0U << 16U) | (0U + 10U);
     adcREG1->BNDEND = (adcREG1->BNDEND & 0xFFFF0000U) | (2U);
  
     /** - Setup event group conversion mode
@@ -334,7 +334,7 @@
 static const uint32 s_adcFiFoSize[2U][3U] =
 {
     {0U,
-    6U,
+    19U,
     32U},
     {16U,
     16U,