Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r24fd1893101af40cc6736aacaa20382875c80bf1 -r3d131237935eb36e56e0d057a713430e31dc6405
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 24fd1893101af40cc6736aacaa20382875c80bf1)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3d131237935eb36e56e0d057a713430e31dc6405)
@@ -1021,6 +1021,34 @@
 
 /*********************************************************************//**
  * @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_DG_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_DG_BROADCAST, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
+ /*********************************************************************//**
+  * @brief
  * The broadcastFlushData function sends out the flush mode data.
  * @details Inputs: none
  * @details Outputs: flush data msg constructed and queued
@@ -1048,6 +1076,90 @@
 
 /*********************************************************************//**
  * @brief
+ * The broadcastChemicalDisinfectData function sends out the chemical
+ * disinfect mode data.
+ * @details Inputs: none
+ * @details Outputs: chemical disinfect data msg constructed and queued
+ * @param chemDisinfectData which is flush msg constructed and queued
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastChemicalDisinfectData( MODE_CHEMICAL_DISINFECT_DATA_T *chemDisinfectData )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_DG_CHEM_DISINFECT_DATA;
+    msg.hdr.payloadLen = sizeof( MODE_CHEMICAL_DISINFECT_DATA_T );
+
+    memcpy( payloadPtr, chemDisinfectData, sizeof( MODE_CHEMICAL_DISINFECT_DATA_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_DG_BROADCAST, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The broadcastChemicalDisinfectData2UI function sends out the chemical
+ * disinfect mode data to the UI.
+ * @details Inputs: none
+ * @details Outputs: chemical disinfect UI data msg constructed and queued
+ * @param chemDisinfectUIData which is flush msg constructed and queued
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastChemicalDisinfectData2UI( MODE_CHEMICAL_DISINFECT_UI_DATA_T *chemDisinfectUIData )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_DG_CHEM_DISINFECT_TIME_DATA;
+    msg.hdr.payloadLen = sizeof( MODE_CHEMICAL_DISINFECT_UI_DATA_T );
+
+    memcpy( payloadPtr, chemDisinfectUIData, sizeof( MODE_CHEMICAL_DISINFECT_UI_DATA_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_DG_2_UI, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The broadcastChemicalDisinfectData2UI function sends out the heat
+ * disinfect mode data to the UI.
+ * @details Inputs: none
+ * @details Outputs: heat disinfect UI data msg constructed and queued
+ * @param heatDisinfectUIData which is flush msg constructed and queued
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastHeatDisinfectData2UI( MODE_HEAT_DISINFECT_UI_DATA_T *heatDisinfectUIData )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_DG_HEAT_DISINFECT_TIME_DATA;
+    msg.hdr.payloadLen = sizeof( MODE_HEAT_DISINFECT_UI_DATA_T );
+
+    memcpy( payloadPtr, heatDisinfectUIData, sizeof( MODE_HEAT_DISINFECT_UI_DATA_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_DG_2_UI, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The sendDGSystemRecord function sends out the DG system record.
  * @details Inputs: none
  * @details Outputs: DG system record msg constructed and queued
@@ -1165,6 +1277,67 @@
 
 /*********************************************************************//**
  * @brief
+ * The sendPOSTTestResult function constructs an DG POST test result message
+ * and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: DG POST test result msg constructed and queued.
+ * @param test ID of DG 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( DG_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_DG_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_DG_BROADCAST, ACK_NOT_REQUIRED );
+
+    return result;
+
+}
+
+/*********************************************************************//**
+ * @brief
+ * The sendPOSTFinalResult function constructs an DG POST final result message
+ * and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: DG POST final result msg constructed and queued.
+ * @param passed TRUE if DG 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_DG_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_DG_BROADCAST, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The sendCommandResponseMsg function constructs a command response to HD
  * and queues the msg for transmit on the appropriate CAN channel.
  * @details Inputs: none
@@ -2195,6 +2368,70 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleTestMonitoredVoltagesSendIntervalOverrideRequest function handles a
+ * request to override the monitored DG 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 DG 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 handleTestSetConductivityOverrideRequest function handles a
  * request to override a conductivity sensor's value
  * @details Inputs: none
@@ -2346,7 +2583,7 @@
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
         if ( FALSE == payload.reset )
         {
-            result = testSetUVReactorHealthOverride( payload.index, (BOOL)payload.state.u32 );
+            result = testSetUVReactorHealthOverride( payload.index, payload.state.u32 );
         }
         else
         {
@@ -2401,13 +2638,13 @@
  *************************************************************************/
 void handleSetFluidLeakStateDetectorOverrideRequest( MESSAGE_T *message )
 {
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    TEST_OVERRIDE_PAYLOAD_T payload;
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
             result = testSetFluidLeakStateOverride( ( FLUID_LEAK_STATES_T)( payload.state.u32 ) );
@@ -2777,7 +3014,7 @@
 /*************************************************************************
  * @brief
  * The handleStartStopDGHeatDisinfect function handles a request start or
- * stop DG heat disifect cycle.
+ * stop DG heat disifect mode.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message: a pointer to the message to handle
@@ -2809,6 +3046,51 @@
 }
 
 /*********************************************************************//**
+ * @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_DG_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_DG_2_UI, ACK_REQUIRED );
+
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_UI, result );
+}
+
+/*********************************************************************//**
 * @brief
 * The handleSetDGCalibrationRecord function handles a request to set the DG
 * calibration data record.
@@ -2842,8 +3124,8 @@
 
 /*********************************************************************//**
 * @brief
-* The handleStartStopDGFlush function handles a request to override start
-* or stop DG flush mode.
+* The handleStartStopDGFlush function handles a request to start or stop
+* DG flush mode.
 * @details Inputs: none
 * @details Outputs: message handled
 * @param message a pointer to the message to handle
@@ -3079,4 +3361,39 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
 }
 
+/*********************************************************************//**
+* @brief
+* The handleStartStopDGChemicalDisinfect function handles a request to start
+* or stop DG chemical disinfect mode.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+BOOL handleStartStopDGChemicalDisinfect( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    if ( message->hdr.payloadLen == sizeof(U32) )
+    {
+        BOOL startingDGChemicalDisinfect;
+
+        memcpy( &startingDGChemicalDisinfect, message->payload, sizeof(U32) );
+
+        if ( TRUE == startingDGChemicalDisinfect )
+        {
+            result = startDGChemicalDisinfect();
+        }
+        else
+        {
+            result = stopChemicalDisinfect();
+        }
+    }
+
+    // Respond to request
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
+
+    return result;
+}
+
 /**@}*/