Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r2cc4f0cfc6512c942864d7d302cef5df375a2081 -r7665e7b142961a50c5e77c44877247366a374526
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 2cc4f0cfc6512c942864d7d302cef5df375a2081)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 7665e7b142961a50c5e77c44877247366a374526)
@@ -1460,6 +1460,124 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The sendHDCalibrationRecord function sends out the HD calibration
+ * record.
+ * @details Inputs: none
+ * @details Outputs: HD calibration record msg constructed and queued
+ * @param msgCurrNum: current payload number
+ * @param msgTotalNum: total number of payloads
+ * @param length: buffer length to be written
+ * @param calRcrdAddress: start address of the calibration record
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendHDCalibrationRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* calRcrdAddress )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_SEND_CALIBRATION_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, calRcrdAddress, 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 sendHDSystemRecord function sends out the HD system record.
+ * @details Inputs: none
+ * @details Outputs: HD 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 sendHDSystemRecord( 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_HD_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 sendHDServiceRecord function sends out the HD service record.
+ * @details Inputs: none
+ * @details Outputs: HD 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 sendHDServiceRecord( 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_HD_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;
+}
+
 #ifdef EMC_TEST_BUILD
 BOOL broadcastCANErrorCount( U32 count )
 {
@@ -4375,4 +4493,181 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*********************************************************************//**
+* @brief
+* The handleSetHDCalibrationRecord function handles a request to set the HD
+* calibration data record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleSetHDCalibrationRecord( 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 = setCalibrationRecord( currentMessage, totalMessages, payloadLength, payloadPtr );
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
+}
+
+/*********************************************************************//**
+* @brief
+* The handleGetHDCalibrationRecord function handles a request to get the HD
+* calibration data record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleGetHDCalibrationRecord( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( 0 == message->hdr.payloadLen )
+    {
+        // Tester must be logged in
+        if ( TRUE == isTestingActivated() )
+        {
+            result = getCalibrationRecord();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+* @brief
+* The handleSetHDSystemRecord function handles a request to set the HD
+* system data record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleSetHDSystemRecord( 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 handleGetHDSystemRecord function handles a request to get the HD
+* system data record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleGetHDSystemRecord( 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 handleGetHDServiceRecord function handles a request to get the HD
+* service data record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleGetHDServiceRecord( 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 handleSetHDServiceRecord function handles a request to set the HD
+* service data record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleSetHDServiceRecord( 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 );
+}
+
 /**@}*/