Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r6cd114c4deffb81e85c6cd3ebaf550fe4661efda -r44a100f8e5210a02c23b8fcc4527d8e96d577381
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6cd114c4deffb81e85c6cd3ebaf550fe4661efda)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 44a100f8e5210a02c23b8fcc4527d8e96d577381)
@@ -497,6 +497,38 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The sendAlarmAudioVolumeSetResponse function constructs an alarm audio
+ * volume set request response to the UI and queues the msg for transmit on the
+ * appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: Alarm audio volume set.
+ * @param accepted flag indicating whether request was accepted
+ * @param rejReason rejection reason code
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendAlarmAudioVolumeSetResponse( U32 accepted, U32 rejReason )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_ALARM_AUDIO_VOLUME_SET_RESPONSE;
+    msg.hdr.payloadLen = sizeof( U32 ) * 2;
+
+    memcpy( payloadPtr, &accepted, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &rejReason, 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_2_UI, ACK_REQUIRED );
+
+    return result;
+}
+
 /*********************************************************************//**
  * @brief
  * The sendTreatmentParamsRangesToUI function constructs a treatment parameter
@@ -538,8 +570,33 @@
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED );
 
     return result;
-}
+}
+
+/*********************************************************************//**
+ * @brief
+ * The sendTreatmentPeriodicDataToUI function constructs a treatment periodic
+ * data message to the UI and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: Treatment parameter ranges msg constructed and queued.
+ * @param periodDataPtr treatment log period data record pointer
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendTreatmentPeriodicDataToUI( TREATMENT_LOG_DATA_PERIODIC_T * periodDataPtr )
+{
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
 
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_TREATMENT_LOG_PERIODIC_DATA;
+    msg.hdr.payloadLen = sizeof( TREATMENT_LOG_DATA_PERIODIC_T );
+
+    memcpy( payloadPtr, periodDataPtr, sizeof( TREATMENT_LOG_DATA_PERIODIC_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
  * The handlePatientDisconnectionConfirmCmd function handles user confirms
@@ -555,8 +612,10 @@
     {
         signalUserConfirmPatientDisconnection();
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**
@@ -574,8 +633,10 @@
     {
         signalUserConfirmDisposableRemoval();
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**
@@ -608,8 +669,10 @@
     {
         handleTreatmentLogDataRequest();
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**
@@ -618,6 +681,8 @@
  * 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 accepted T/F - was treatment log request accepted?
+ * @param reason reason why request was rejected (or zero if accepted)
  * @param logDataPtr treatment log data record pointer
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
@@ -640,6 +705,58 @@
     // 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
+ * The handleUIActiveAlarmsListRequest function handles UI active alarms list request.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none.
+ *************************************************************************/
+void handleUIActiveAlarmsListRequest( MESSAGE_T *message )
+{
+    if ( 0 == message->hdr.payloadLen )
+    {
+        handleActiveAlarmListRequest();
+    }
+    else
+    {
+        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.
+ * @details Outputs: Treatment log data msg constructed and queued.
+ * @param accepted T/F - was treatment log request accepted?
+ * @param alarmList pointer to active alarms list record
+ * @param size the size of active alarms list
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendActiveAlarmsList( BOOL accepted, U32 reason, U32 *alarmList, U32 size )
+{
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_ACTIVE_ALARMS_LIST_REQUEST_RESPONSE;
+    msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( U32 ) + size;
+
+    memcpy( payloadPtr, &accepted, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &reason, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, alarmList, size );
+
+    // 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
@@ -659,8 +776,10 @@
         memcpy( &cmd, &message->payload[0], sizeof( U32 ) );
         signalSampleWaterUserAction( (REQUESTED_SAMPLE_WATER_USER_ACTIONS_T)cmd );
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**
@@ -695,8 +814,10 @@
         memcpy( &result, &message->payload[0], sizeof( U32 ) );
         setSampleWaterResult( (BOOL) result );
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**
@@ -714,8 +835,10 @@
     {
         signalUserConfirmConsumableInstall();
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**
@@ -733,8 +856,10 @@
     {
         signalUserConfirmInstallation();
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**
@@ -752,8 +877,10 @@
     {
         signalStartPrime();
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**
@@ -786,8 +913,10 @@
     {
         signalUserContinueToTreatment();
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**
@@ -820,8 +949,10 @@
     {
         signalUserConfirmPatientConnection();
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**
@@ -853,8 +984,10 @@
     {
         signalUserStartTreatment();
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
 }
 
 /*********************************************************************//**
@@ -1110,27 +1243,72 @@
  * The handleDGCmdResp function handles a DG command response message.
  * @details Inputs: none
  * @details Outputs: message handled, response constructed and queued for transmit.
- * @param messagePtr pointer to the message to handle.
+ * @param message pointer to the message to handle.
  * @return none
  *************************************************************************/
-void handleDGCmdResp( MESSAGE_T *messagePtr )
+void handleDGCmdResp( MESSAGE_T *message )
 {
     BOOL result = FALSE;
 
-    if ( messagePtr->hdr.payloadLen == sizeof( DG_CMD_RESPONSE_T ) )
+    if ( message->hdr.payloadLen == sizeof( DG_CMD_RESPONSE_T ) )
     {
         DG_CMD_RESPONSE_T dgCmdResponse;
 
         result = TRUE;
-        memcpy( &dgCmdResponse,  messagePtr->payload, sizeof( DG_CMD_RESPONSE_T ) );
+        memcpy( &dgCmdResponse,  message->payload, sizeof( DG_CMD_RESPONSE_T ) );
         handleDGCommandResponse( &dgCmdResponse );
     }
 
-    sendAckResponseMsg( (MSG_ID_T)messagePtr->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_DG, result );
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_DG, result );
 }
 
 /*********************************************************************//**
  * @brief
+ * The handleUIClockSyncRequest function handles a UI clock sync message.
+ * @details Inputs: none
+ * @details Outputs: message handled, response constructed and queued for transmit.
+ * @param messagePtr pointer to the message to handle.
+ * @return none
+ *************************************************************************/
+void handleUIClockSyncRequest( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+    U32 rejReason = REQUEST_REJECT_REASON_NONE;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    if ( message->hdr.payloadLen == sizeof( U32 ) )
+    {
+        U32 epoch;
+
+        memcpy( &epoch,  message->payload, sizeof( U32 ) );
+        result = setRTCEpoch( epoch );
+        if ( FALSE == result )
+        {
+            rejReason = REQUEST_REJECT_REASON_INVALID_DATE_OR_TIME;
+        }
+    }
+    else
+    {
+        rejReason = REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT;
+    }
+
+    // Create a response message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_UI_SET_RTC_RESPONSE;
+    msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( U32 );
+    memcpy( payloadPtr, &result, sizeof( BOOL ) );
+    payloadPtr += sizeof( BOOL );
+    memcpy( payloadPtr, &rejReason, 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_2_UI, ACK_REQUIRED );
+
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, result );
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleDGOpMode function handles a DG broadcast of its current mode.
  * @details Inputs: none
  * @details Outputs: message handled, response constructed and queued for transmit.
@@ -1236,14 +1414,43 @@
     payload.alarmsFlags |= ( almStatus.alarmsToEscalate             ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_ALARMS_TO_ESCALATE) : 0 );
     payload.alarmsFlags |= ( almStatus.alarmsSilenced               ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_ALARMS_SILENCED)    : 0 );
     payload.alarmsFlags |= ( almStatus.lampOn                       ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_LAMP_ON)            : 0 );
-    payload.alarmsFlags |= ( almStatus.topAlarmConditionnDetected   ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION)      : 0 );
+    payload.alarmsFlags |= ( almStatus.noMinimize                   ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_MINIMIZE)        : 0 );
+    payload.alarmsFlags |= ( almStatus.topAlarmConditionDetected    ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION)      : 0 );
 
     memcpy( payloadPtr, &payload, sizeof( ALARM_COMP_STATUS_PAYLOAD_T ) );
 
     // 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_ALARM, ACK_NOT_REQUIRED );
 
     return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The broadcastAlarmInfo function constructs an alarm information msg to
+ * be broadcast and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: alarm information msg constructed and queued.
+ * @param data alarm information record
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastAlarmInfo( ALARM_INFO_PAYLOAD_T data )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_ALARM_INFORMATION;
+    msg.hdr.payloadLen = sizeof( ALARM_INFO_PAYLOAD_T );
+
+    memcpy( payloadPtr, &data, sizeof( ALARM_INFO_PAYLOAD_T ) );
+
+    // 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;
 }
 
 /*********************************************************************//**
@@ -1507,6 +1714,34 @@
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_BROADCAST, ACK_NOT_REQUIRED );
 
     return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The broadcastVoltagesData function constructs a monitored voltages data msg to
+ * be broadcast and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: monitored voltages data msg constructed and queued.
+ * @param data Latest monitored voltage values.
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastVoltagesData( VOLTAGES_DATA_PAYLOAD_T data )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_VOLTAGES_DATA;
+    msg.hdr.payloadLen = sizeof( VOLTAGES_DATA_PAYLOAD_T );
+
+    memcpy( payloadPtr, &data, sizeof( VOLTAGES_DATA_PAYLOAD_T ) );
+
+    // 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;
 }
 
 /*********************************************************************//**
@@ -2037,6 +2272,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
@@ -2300,14 +2570,24 @@
  *************************************************************************/
 void handleUIAlarmSilenceRequest( MESSAGE_T *message )
 {
+#ifndef TEMP_UI_ALARM_SILENCE_FIX
     if ( message->hdr.payloadLen == sizeof( U32 ) )
+#else
+    if ( message->hdr.payloadLen == sizeof( U08 ) )
+#endif
     {
         U08 *payloadPtr = message->payload;
+#ifndef TEMP_UI_ALARM_SILENCE_FIX
         U32 cmd;
 
         memcpy( &cmd, payloadPtr, sizeof( U32 ) );
+        signalAlarmSilence( (ALARM_SILENCE_CMD_T)cmd );
+#else
+        U08 cmd;
 
+        memcpy( &cmd, payloadPtr, sizeof( U08 ) );
         signalAlarmSilence( (ALARM_SILENCE_CMD_T)cmd );
+#endif
     }
     else
     {
@@ -2343,6 +2623,117 @@
     }
 }
 
+/*********************************************************************//**
+ * @brief
+ * The sendPOSTTestResult function constructs an HD POST test result message
+ * and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: HD POST test result msg constructed and queued.
+ * @param test ID of HD POST test
+ * @param passed TRUE if POST test passed, FALSE if not
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendPOSTTestResult( HD_POST_STATE_T test, BOOL passed )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+    U32 testID = (U32)test;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_POST_SINGLE_TEST_RESULT;
+    msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( U32 );
+
+    memcpy( payloadPtr, &passed, sizeof( BOOL ) );
+    payloadPtr += sizeof( BOOL );
+    memcpy( payloadPtr, &testID, 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 ); // TODO - make ack required when UI ready
+
+    return result;
+
+}
+
+/*********************************************************************//**
+ * @brief
+ * The sendPOSTFinalResult function constructs an HD POST final result message
+ * and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: HD POST final result msg constructed and queued.
+ * @param passed TRUE if HD POST passed, FALSE if not
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendPOSTFinalResult( BOOL passed )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_POST_FINAL_TEST_RESULT;
+    msg.hdr.payloadLen = sizeof( BOOL );
+
+    memcpy( payloadPtr, &passed, sizeof( BOOL ) );
+
+    // 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 ); // TODO - make ack required when UI ready
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleDGPOSTFinalResult function handles a DG POST final result message.
+ * @details Inputs: none
+ * @details Outputs: DG POST final result delivered to InitPOST mode.
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleDGPOSTFinalResult( MESSAGE_T *message )
+{
+    if ( message->hdr.payloadLen == sizeof( BOOL ) )
+    {
+        U08 *payloadPtr = message->payload;
+        BOOL passed;
+
+        memcpy( &passed, payloadPtr, sizeof( BOOL ) );
+
+        // TODO - handle DG POST  final result
+    }
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleUIPOSTFinalResult function handles a UI POST final result message.
+ * @details Inputs: none
+ * @details Outputs: UI POST final result delivered to InitPOST mode.
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleUIPOSTFinalResult( MESSAGE_T *message )
+{
+    if ( message->hdr.payloadLen == sizeof( BOOL ) )
+    {
+        U08 *payloadPtr = message->payload;
+        BOOL passed;
+
+        memcpy( &passed, payloadPtr, sizeof( BOOL ) );
+
+        // TODO - handle UI POST  final result
+    }
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
+}
+
 /*********************************************************************//**
  * @brief
  * The handleOffButtonConfirmMsgFromUI function handles a response to an
@@ -2903,6 +3294,31 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleAlarmAudioVolumeSetCmd function handles a alarm audio volume
+ * set request message from the UI.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleAlarmAudioVolumeSetCmd( MESSAGE_T *message )
+{
+    if ( sizeof( U32 ) == message->hdr.payloadLen )
+    {
+        U32 payload;
+
+        memcpy( &payload, &message->payload[0], sizeof( U32 ) );
+
+        setAlarmAudioVolume( payload );
+    }
+    else
+    {
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+    }
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleSalineBolusRequest function handles a saline bolus request
  * message from the UI.
  * @details Inputs: none
@@ -5039,6 +5455,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
@@ -5609,4 +6115,356 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleTestMonitoredVoltagesSendIntervalOverrideRequest function handles a
+ * request to override the monitored HD voltages data publication interval.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestMonitoredVoltagesSendIntervalOverrideRequest( 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 = testSetVoltagesDataPublishIntervalOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetVoltagesDataPublishIntervalOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestMonitoredVoltageOverrideRequest function handles a
+ * request to override the monitored HD voltage override.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestMonitoredVoltageOverrideRequest( 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 = testSetLineLevelOverride( payload.index, payload.state.f32 );
+        }
+        else
+        {
+            result = testResetLineLevelOverride( payload.index );
+        }
+    }
+
+    // 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
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestAlarmInfoSendIntervalOverrideRequest( 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 = testSetAlarmInfoPublishIntervalOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetAlarmInfoPublishIntervalOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestAlarmAudioVolumeOverrideRequest function handles a
+ * request to override the alarm audio volume level.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestAlarmAudioVolumeOverrideRequest( 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 = testSetAlarmAudioVolumeLevelOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetAlarmAudioVolumeLevelOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestAlarmAudioCurrentHgOverrideRequest function handles a
+ * request to override the alarm audio (high gain) current.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestAlarmAudioCurrentHgOverrideRequest( 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 = testSetPrimaryAlarmAudioCurrentHGOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetPrimaryAlarmAudioCurrentHGOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestAlarmAudioCurrentLgOverrideRequest function handles a
+ * request to override the alarm audio (low gain) current.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestAlarmAudioCurrentLgOverrideRequest( 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 = testSetPrimaryAlarmAudioCurrentLGOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetPrimaryAlarmAudioCurrentLGOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestAlarmBackupAudioCurrentOverrideRequest function handles a
+ * request to override the backup alarm audio current.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestAlarmBackupAudioCurrentOverrideRequest( 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 = testSetBackupAlarmAudioCurrentOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetBackupAlarmAudioCurrentOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestSyringePumpStatusOverrideRequest function handles a
+ * request to override the syringe pump status.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestSyringePumpStatusOverrideRequest( 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 = testSetSyringePumpStatus( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetSyringePumpStatus();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestSyringePumpEncoderStatusOverrideRequest function handles a
+ * request to override the syringe pump encoder status.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestSyringePumpEncoderStatusOverrideRequest( 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 = testSetSyringePumpEncoderStatus( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetSyringePumpEncoderStatus();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestSyringePumpADCandDACStatusOverrideRequest function handles a
+ * request to override the syringe pump ADC & DAC status.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestSyringePumpADCandDACStatusOverrideRequest( 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 = testSetSyringePumpADCandDACStatus( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetSyringePumpADCandDACStatus();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestSyringePumpADCReadCtrOverrideRequest function handles a
+ * request to override the syringe pump ADC read counter.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestSyringePumpADCReadCtrOverrideRequest( 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 = testSetSyringePumpADCReadCounter( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetSyringePumpADCReadCounter();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /**@}*/