Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r1e34d32fcfac88792ed72e55953dee721bacd9d5 -r9426334142cbfdea9ee99e3040fc08ff0247da7b
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 1e34d32fcfac88792ed72e55953dee721bacd9d5)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 9426334142cbfdea9ee99e3040fc08ff0247da7b)
@@ -1467,7 +1467,97 @@
     serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_HD, ACK_REQUIRED );
 }
 
+/*********************************************************************//**
+* @brief
+* The handleServiceModeRequest function handles a request to enter service
+* mode.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleServiceModeRequest( MESSAGE_T *message )
+{
+    BOOL status = FALSE;
+    DG_OP_MODE_T currentMode = getCurrentOperationMode();
+    REQUEST_REJECT_REASON_CODE_T reject;
 
+    if ( 0 == message->hdr.payloadLen )
+    {
+        if ( ( DG_MODE_STAN == currentMode ) || ( DG_MODE_FAUL == currentMode ) )
+        {
+            status = TRUE;
+            requestNewOperationMode( DG_MODE_SERV );
+            reject = REQUEST_REJECT_REASON_NONE;
+        }
+        else
+        {
+            reject = REQUEST_REJECT_REASON_DG_NOT_IN_STANDBY_IDLE_STATE;
+        }
+    }
+    else
+    {
+        reject = REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT;
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
+    sendServiceModeResponse( status, (U32)reject );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The sendServiceModeResponse function sends out the DG response to a
+ * UI request to go to service mode.
+ * @details Inputs: none
+ * @details Outputs: Service mode request response msg constructed and queued
+ * @param accepted TRUE if request was accepted, FALSE if not
+ * @param rejCode Reject reason code explaining why request was rejected
+ * @return none
+ *************************************************************************/
+BOOL sendServiceModeResponse( BOOL accepted, U32 rejCode )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_DG_RESPONSE_SERVICE_MODE_REQUEST;
+    msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( U32 );
+
+    memcpy( payloadPtr, &accepted, sizeof( BOOL ) );
+    payloadPtr += sizeof( BOOL );
+    memcpy( payloadPtr, &rejCode, 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_HD, ACK_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleSetDGServiceTime function sets the DG service time once the
+ * command is received from UI
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleSetDGServiceTime( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    if ( 0 == message->hdr.payloadLen )
+    {
+        result = setServiceTime();
+    }
+
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_UI, result );
+}
+
+
 // ***********************************************************************
 // **************** Message Handling Helper Functions ********************
 // ***********************************************************************
@@ -3091,19 +3181,16 @@
     U32 totalMessages;
     U32 payloadLength;
 
-    if ( 0 == message->hdr.payloadLen )
-    {
-        memcpy(&currentMessage, payloadPtr, sizeof(U32));
-        payloadPtr += sizeof(U32);
+    memcpy(&currentMessage, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
 
-        memcpy(&totalMessages, payloadPtr, sizeof(U32));
-        payloadPtr += sizeof(U32);
+    memcpy(&totalMessages, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
 
-        memcpy(&payloadLength, payloadPtr, sizeof(U32));
-        payloadPtr += sizeof(U32);
+    memcpy(&payloadLength, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
 
-        status = receiveRecordFromDialin( NVDATAMGMT_SERVICE_RECORD, currentMessage, totalMessages, payloadLength, payloadPtr );
-    }
+    status = receiveRecordFromDialin( NVDATAMGMT_SERVICE_RECORD, currentMessage, totalMessages, payloadLength, payloadPtr );
 
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
@@ -3783,71 +3870,27 @@
 
 /*********************************************************************//**
 * @brief
-* The handleServiceModeRequest function handles a request to enter service
-* mode.
+* The handleTestDGNVRecordCRCOverride function handles a request to override
+* the selected NV record's CRC.
 * @details Inputs: none
 * @details Outputs: message handled
 * @param message a pointer to the message to handle
 * @return none
 *************************************************************************/
-void handleServiceModeRequest( MESSAGE_T *message )
+void handleTestDGNVRecordCRCOverride( MESSAGE_T *message )
 {
-    BOOL status = FALSE;
-    DG_OP_MODE_T currentMode = getCurrentOperationMode();
-    REQUEST_REJECT_REASON_CODE_T reject;
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
-    if ( 0 == message->hdr.payloadLen )
+    // verify payload length
+    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-        if ( ( DG_MODE_STAN == currentMode ) || ( DG_MODE_FAUL == currentMode ) )
-        {
-            status = TRUE;
-            requestNewOperationMode( DG_MODE_SERV );
-            reject = REQUEST_REJECT_REASON_NONE;
-        }
-        else
-        {
-            reject = REQUEST_REJECT_REASON_DG_NOT_IN_STANDBY_IDLE_STATE;
-        }
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
+        result = testSetNVRecordCRCOverride( payload.index, (U16)payload.state.u32 );
     }
-    else
-    {
-        reject = REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT;
-    }
 
-    // Respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
-    sendServiceModeResponse( status, (U32)reject );
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
-/*********************************************************************//**
- * @brief
- * The sendServiceModeResponse function sends out the DG response to a
- * UI request to go to service mode.
- * @details Inputs: none
- * @details Outputs: Service mode request response msg constructed and queued
- * @param accepted TRUE if request was accepted, FALSE if not
- * @param rejCode Reject reason code explaining why request was rejected
- * @return none
- *************************************************************************/
-BOOL sendServiceModeResponse( BOOL accepted, U32 rejCode )
-{
-    BOOL result;
-    MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
-
-    // Create a message record
-    blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_RESPONSE_SERVICE_MODE_REQUEST;
-    msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( U32 );
-
-    memcpy( payloadPtr, &accepted, sizeof( BOOL ) );
-    payloadPtr += sizeof( BOOL );
-    memcpy( payloadPtr, &rejCode, 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_HD, ACK_REQUIRED );
-
-    return result;
-}
-
 /**@}*/