Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -ra6684f5a4c807bf27996b9521c6d0f9f7c85d9f5 -rcb586152197059cb52c33474f5b9be0855bbad51
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision a6684f5a4c807bf27996b9521c6d0f9f7c85d9f5)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision cb586152197059cb52c33474f5b9be0855bbad51)
@@ -873,17 +873,17 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_SEND_CALIBRATION_DATA;
-    msg.hdr.payloadLen = sizeof( payloadCurrNum ) + sizeof( payloadTotalNum ) + sizeof( length ) + length;
+    msg.hdr.msgID = MSG_ID_DG_SEND_CALIBRATION_RECORD;
+    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ) + length;
 
-    memcpy( payloadPtr, &payloadCurrNum, sizeof( payloadCurrNum ) );
-    payloadPtr += sizeof( payloadCurrNum );
+    memcpy( payloadPtr, &payloadCurrNum, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
 
-    memcpy( payloadPtr, &payloadTotalNum, sizeof( payloadTotalNum ) );
-    payloadPtr += sizeof( payloadTotalNum );
+    memcpy( payloadPtr, &payloadTotalNum, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
 
-    memcpy( payloadPtr, &length, sizeof( length ) );
-    payloadPtr += sizeof( length );
+    memcpy( payloadPtr, &length, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
 
     memcpy( payloadPtr, calRcrdAddress, length );
 
@@ -893,6 +893,123 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The sendDGSystemRecord function sends out the DG system record.
+ * @details Inputs: none
+ * @details Outputs: DG system record msg constructed and queued
+ * @param msgCurrNum: current payload number
+ * @param msgTotalNum: total number of payloads
+ * @param length: buffer length to be written
+ * @param sysRcrdAddress: start address of the system record
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendDGSystemRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* sysRcrdAddress )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_DG_SEND_SYSTEM_RECORD;
+    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ) + length;
+
+    memcpy( payloadPtr, &payloadCurrNum, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+
+    memcpy( payloadPtr, &payloadTotalNum, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+
+    memcpy( payloadPtr, &length, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+
+    memcpy( payloadPtr, sysRcrdAddress, length );
+
+    // 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_PC, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The sendDGServiceRecord function sends out the DG service record.
+ * @details Inputs: none
+ * @details Outputs: DG system record msg constructed and queued
+ * @param msgCurrNum: current payload number
+ * @param msgTotalNum: total number of payloads
+ * @param length: buffer length to be written
+ * @param srvcRcrdAddress: start address of the service record
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendDGServiceRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* srvcRcrdAddress )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_DG_SEND_SERVICE_RECORD;
+    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ) + length;
+
+    memcpy( payloadPtr, &payloadCurrNum, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+
+    memcpy( payloadPtr, &payloadTotalNum, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+
+    memcpy( payloadPtr, &length, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+
+    memcpy( payloadPtr, srvcRcrdAddress, length );
+
+    // 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_PC, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The sendDGServiceRecord function sends out the DG service record.
+ * @details Inputs: none
+ * @details Outputs: DG system record msg constructed and queued
+ * @param msgCurrNum: current payload number
+ * @param msgTotalNum: total number of payloads
+ * @param length: buffer length to be written
+ * @param scheduledRcrdAddress: start address of the scheduled runs record
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendDGScheduledRunsRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* scheduledRcrdAddress )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_DG_SEND_SCHEDULED_RUNS_RECORD;
+    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ) + length;
+
+    memcpy( payloadPtr, &payloadCurrNum, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+
+    memcpy( payloadPtr, &payloadTotalNum, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+
+    memcpy( payloadPtr, &length, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+
+    memcpy( payloadPtr, scheduledRcrdAddress, length );
+
+    // 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_PC, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
 // ***********************************************************************
 // **************** Message Handling Helper Functions ********************
 // ***********************************************************************
@@ -2415,46 +2532,46 @@
 
 /*********************************************************************//**
 * @brief
-* The handleSetDGCalibration function handles a request to set the DG
+* The handleSetDGCalibrationRecord function handles a request to set the DG
 * calibration data record.
 * @details Inputs: none
 * @details Outputs: message handled
 * @param message a pointer to the message to handle
 * @return none
 *************************************************************************/
-void handleSetDGCalibration( MESSAGE_T *message )
+void handleSetDGCalibrationRecord( MESSAGE_T *message )
 {
     BOOL status = FALSE;
     U08* payloadPtr = message->payload;
     U32 currentMessage;
     U32 totalMessages;
     U32 payloadLength;
 
-    memcpy(&currentMessage, payloadPtr, sizeof(currentMessage));
-    payloadPtr += sizeof(currentMessage);
+    memcpy(&currentMessage, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
 
-    memcpy(&totalMessages, payloadPtr, sizeof(totalMessages));
-    payloadPtr += sizeof(totalMessages);
+    memcpy(&totalMessages, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
 
-    memcpy(&payloadLength, payloadPtr, sizeof(payloadLength));
-    payloadPtr += sizeof(payloadLength);
+    memcpy(&payloadLength, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
 
-    status = setDGCalibrationRecord( currentMessage, totalMessages, payloadLength, payloadPtr );
+    status = setCalibrationRecord( currentMessage, totalMessages, payloadLength, payloadPtr );
 
-    // respond to request
+    // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
 }
 
 /*********************************************************************//**
 * @brief
-* The handleGetDGCalibration function handles a request to get the DG
+* The handleGetDGCalibrationRecord function handles a request to get the DG
 * calibration data record.
 * @details Inputs: none
 * @details Outputs: message handled
 * @param message a pointer to the message to handle
 * @return none
 *************************************************************************/
-void handleGetDGCalibration( MESSAGE_T *message )
+void handleGetDGCalibrationRecord( MESSAGE_T *message )
 {
     BOOL result = FALSE;
 
@@ -2464,12 +2581,189 @@
         // Tester must be logged in
         if ( TRUE == isTestingActivated() )
         {
-            getDGCalibrationRecord();
+            result = getCalibrationRecord();
         }
     }
 
     // respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*********************************************************************//**
+* @brief
+* The handleSetDGSystemRecord function handles a request to set the DG
+* system data record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleSetDGSystemRecord( MESSAGE_T *message )
+{
+    BOOL status = FALSE;
+    U08* payloadPtr = message->payload;
+    U32 currentMessage;
+    U32 totalMessages;
+    U32 payloadLength;
+
+    memcpy(&currentMessage, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
+
+    memcpy(&totalMessages, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
+
+    memcpy(&payloadLength, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
+
+    status = setSystemRecord( currentMessage, totalMessages, payloadLength, payloadPtr );
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
+}
+
+/*********************************************************************//**
+* @brief
+* The handleGetDGSystemRecord function handles a request to get the DG
+* system data record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleGetDGSystemRecord( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( 0 == message->hdr.payloadLen )
+    {
+        // Tester must be logged in
+        if ( TRUE == isTestingActivated() )
+        {
+            result = getSystemRecord();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+* @brief
+* The handleGetDGServiceRecord function handles a request to get the DG
+* last service data record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleGetDGServiceRecord( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( 0 == message->hdr.payloadLen )
+    {
+        // Tester must be logged in
+        if ( TRUE == isTestingActivated() )
+        {
+            result = getServiceRecord();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+* @brief
+* The handleSetDGServiceRecord function handles a request to set the DG
+* service data record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleSetDGServiceRecord( MESSAGE_T *message )
+{
+    BOOL status = FALSE;
+    U08* payloadPtr = message->payload;
+    U32 currentMessage;
+    U32 totalMessages;
+    U32 payloadLength;
+
+    memcpy(&currentMessage, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
+
+    memcpy(&totalMessages, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
+
+    memcpy(&payloadLength, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
+
+    status = setServiceRecord( currentMessage, totalMessages, payloadLength, payloadPtr );
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
+}
+
+/*********************************************************************//**
+* @brief
+* The handleGetDGServiceRecord function handles a request to get the DG
+* scheduled runs data record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleGetDGScheduledRunsRecord( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( 0 == message->hdr.payloadLen )
+    {
+        // Tester must be logged in
+        if ( TRUE == isTestingActivated() )
+        {
+            result = getScheduledRunsRecord();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+* @brief
+* The handleSetDGScheduledRunsRecord function handles a request to set the DG
+* scheduled runs data record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleSetDGScheduledRunsRecord( MESSAGE_T *message )
+{
+    BOOL status = FALSE;
+    U08* payloadPtr = message->payload;
+    U32 currentMessage;
+    U32 totalMessages;
+    U32 payloadLength;
+
+    memcpy(&currentMessage, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
+
+    memcpy(&totalMessages, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
+
+    memcpy(&payloadLength, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
+
+    status = setScheduledRunsRecord( currentMessage, totalMessages, payloadLength, payloadPtr );
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
+}
+
 /**@}*/