Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r571b60526886063837c36da45c6685cdda9483cc -r23ad90c3d5f08e67a1142a68c73d79fedb752da9
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 571b60526886063837c36da45c6685cdda9483cc)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 23ad90c3d5f08e67a1142a68c73d79fedb752da9)
@@ -152,7 +152,9 @@
             data[ msgSize++ ] = 0;
         }
 
+#ifndef _RELEASE_
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ACK_ERRORS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
         {
             // If ACK required, add to pending ACK list
             if ( TRUE == ackReq )
@@ -2324,7 +2326,7 @@
         TEMPERATURE_SENSORS_DATA_T payload;
 
         memcpy( &payload, message->payload, sizeof( TEMPERATURE_SENSORS_DATA_T ) );
-        setDialysateTemperatureReadings( payload.inletDialysate, payload.outletRedundant );
+        setDialysateTemperatureReadings( payload.TDi, payload.TRo );
     }
     // TODO - what to do if invalid payload length?
     // TODO - how to know if DG stops sending these?
@@ -3209,7 +3211,7 @@
 void handleHDUsageInfoRequest( MESSAGE_T *message )
 {
     MESSAGE_T msg;
-    U32 payload = getTreatmentTime();
+    U32 payload = 0;
     U08 *payloadPtr = msg.payload;
 
     // Create a message record
@@ -5150,6 +5152,7 @@
     if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+
         if ( FALSE == payload.reset )
         {
             result = testSetBatteryRemainingPercentOverride( payload.state.u32 );
@@ -5846,6 +5849,7 @@
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
 
+#ifndef _RELEASE_
     // Verify payload length
     if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
     {
@@ -5859,6 +5863,7 @@
             result = testResetValvesCurrentOverride( payload.index );
         }
     }
+#endif
 
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
@@ -5911,6 +5916,7 @@
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
 
+#ifndef _RELEASE_
     // Verify payload length
     if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
     {
@@ -5924,6 +5930,7 @@
             result = testResetValvesPositionCountOverride( payload.index );
         }
     }
+#endif
 
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
@@ -6808,39 +6815,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestFansRPMAlarmStartTimeOverrideRequest function handles a
- * request to override the fan RPM alarm start time.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleTestFansRPMAlarmStartTimeOffsetOverrideRequest( 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 = testSetFanRPMAlarmStartTimeOffsetOverride( payload.state.u32 );
-        }
-        else
-        {
-            result = testResetFanRPMAlarmStartTimeOffsetOverride();
-        }
-    }
-
-    // Respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
- * @brief
  * The handleSetFansDutyCycleOverrideRequest function handles a
  * request to override the fans duty cycle.
  * @details Inputs: none
@@ -6918,6 +6892,33 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleTestFansRPMAlarmStartTimeOffsetRequest function handles a
+ * request to set the fans RPM alarm start time offset.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestFansRPMAlarmStartTimeOffsetRequest( MESSAGE_T *message )
+{
+    U32 rpmTimeOffset;
+
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof(U32) == message->hdr.payloadLen )
+    {
+        memcpy( &rpmTimeOffset, message->payload, sizeof(U32) );
+
+        result = testSetFanRPMAlarmStartTimestamp( rpmTimeOffset );
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
  * The sendHDSWConfigRecord function sends out the HD software configuration record.
  * @details Inputs: none
  * @details Outputs: HD software configuration record msg constructed and queued
@@ -7018,4 +7019,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;
+}
+
 /**@}*/