Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rd9494f9253253d56dc88a4b772af1610fd7cfcab -r607854ec35335ec37a9e83976a4fb6655cc0fe90
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d9494f9253253d56dc88a4b772af1610fd7cfcab)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 607854ec35335ec37a9e83976a4fb6655cc0fe90)
@@ -3209,7 +3209,7 @@
 void handleHDUsageInfoRequest( MESSAGE_T *message )
 {
     MESSAGE_T msg;
-    U32 payload = getTreatmentTime();
+    U32 payload = 0;
     U08 *payloadPtr = msg.payload;
 
     // Create a message record
@@ -7017,4 +7017,106 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
 }
 
+/*********************************************************************//**
+* @brief
+* The handleGetHDUsageInfoRecord function handles a request to get the HD
+* usage information record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleGetHDUsageInfoRecord( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( 0 == message->hdr.payloadLen )
+    {
+        // Tester must be logged in
+        if ( TRUE == isTestingActivated() )
+        {
+            result = sendRecordToDialin( NVDATAMGMT_USAGE_INFO_RECORD );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+* @brief
+* The handleSetHDUsageInfoRecord function handles a request to set the HD
+* information record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleSetHDUsageInfoRecord( MESSAGE_T *message )
+{
+    U32 currentMessage;
+    U32 totalMessages;
+    U32 payloadLength;
+
+    BOOL status = FALSE;
+    U08* payloadPtr = message->payload;
+
+    if ( message->hdr.payloadLen >= ( sizeof(currentMessage) + sizeof(totalMessages) + sizeof(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 = receiveRecordFromDialin( NVDATAMGMT_USAGE_INFO_RECORD, currentMessage, totalMessages, payloadLength, payloadPtr );
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The sendDGUsageInfoRecord function sends out the DG usage information record.
+ * @details Inputs: none
+ * @details Outputs: DG usage information record msg constructed and queued
+ * @param msgCurrNum: current payload number
+ * @param msgTotalNum: total number of payloads
+ * @param length: buffer length to be written
+ * @param usageInfoAddress: start address of the susage information record
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL handleSendHDUsageInfoRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* usageInfoAddress )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_SEND_USAGE_INFO_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, usageInfoAddress, 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;
+}
+
 /**@}*/