Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rf15b66d94af1b415f57a7cc37372dba4fa793fbe -rf2fc3885d55b51a6201c8f4f38e57cf7bcf3ee46
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f15b66d94af1b415f57a7cc37372dba4fa793fbe)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f2fc3885d55b51a6201c8f4f38e57cf7bcf3ee46)
@@ -1980,6 +1980,105 @@
     }
 }
 
+/*********************************************************************//**
+ * @brief
+ * The sendHDSWConfigRecord function sends out the HD software configuration record.
+ * @details Inputs: none
+ * @details Outputs: HD software configuration record msg constructed and queued
+ * @param msgCurrNum: current payload number
+ * @param msgTotalNum: total number of payloads
+ * @param length: buffer length to be written
+ * @param swRcrdAddress: start address of the software configuration record
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendHDSWConfigRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* swRcrdAddress )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_SEND_SW_CONFIG_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, swRcrdAddress, 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 handleGetHDSoftwareConfigRecord function handles a request to get the HD
+* software configuration record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleGetHDSoftwareConfigRecord( 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_SW_CONFIG_RECORD );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+* @brief
+* The handleSetHDSoftwareConfigRecord function handles a request to set the HD
+* software configuration record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleSetHDSoftwareConfigRecord( MESSAGE_T *message )
+{
+    U32 currentMessage;
+    U32 totalMessages;
+    U32 payloadLength;
+
+    BOOL status = FALSE;
+    U08* payloadPtr = message->payload;
+
+    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_SW_CONFIG_RECORD, currentMessage, totalMessages, payloadLength, payloadPtr );
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
+}
+
 #ifdef EMC_TEST_BUILD
 BOOL broadcastCANErrorCount( U32 count )
 {
@@ -2307,7 +2406,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?
@@ -3102,7 +3201,12 @@
 void handleHDSerialNumberRequest( void )
 {
     MESSAGE_T msg;
-    HD_SYSTEM_RECORD_T system = getHDSystemRecord();
+    HD_SYSTEM_RECORD_T system;
+
+    // Get the system's record. There are no arrays of system to check and also, raise no alarm since the system record
+    // has been already checked in POST
+    getNVRecord2Driver( GET_SYS_RECORD, (U08*)&system, sizeof( HD_SYSTEM_RECORD_T ), 0, ALARM_ID_NO_ALARM );
+
     U08 *payloadPtr = msg.payload;
 
     // Create a message record
@@ -3154,7 +3258,10 @@
 void handleHDServiceScheduleRequest( MESSAGE_T *message )
 {
     MESSAGE_T msg;
-    HD_SERVICE_RECORD_T payload = getHDServiceRecord();
+    HD_SERVICE_RECORD_T service;
+
+    getNVRecord2Driver( GET_SRV_RECORD, (U08*)&service, sizeof( HD_SERVICE_RECORD_T ), 0, ALARM_ID_NO_ALARM );
+
     U08 *payloadPtr = msg.payload;
 
     // Create a message record
@@ -3163,9 +3270,9 @@
     msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 );
 
     // Fill message payload
-    memcpy( payloadPtr, &payload.lastServiceEpochDate, sizeof( U32 ) );
+    memcpy( payloadPtr, &service.lastServiceEpochDate, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
-    memcpy( payloadPtr, &payload.serviceIntervalSeconds, sizeof( U32 ) );
+    memcpy( payloadPtr, &service.serviceIntervalSeconds, sizeof( U32 ) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED );
@@ -5125,6 +5232,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 );
@@ -5375,7 +5483,7 @@
     memcpy(&payloadLength, payloadPtr, sizeof(U32));
     payloadPtr += sizeof(U32);
 
-    status = setCalibrationRecord( currentMessage, totalMessages, payloadLength, payloadPtr );
+    status = receiveRecordFromDialin( NVDATAMGMT_CALIBRATION_RECORD, currentMessage, totalMessages, payloadLength, payloadPtr );
 
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
@@ -5400,7 +5508,7 @@
         // Tester must be logged in
         if ( TRUE == isTestingActivated() )
         {
-            result = getCalibrationRecord();
+            result = sendRecordToDialin( NVDATAMGMT_CALIBRATION_RECORD );
         }
     }
 
@@ -5523,7 +5631,7 @@
     memcpy(&payloadLength, payloadPtr, sizeof(U32));
     payloadPtr += sizeof(U32);
 
-    status = setSystemRecord( currentMessage, totalMessages, payloadLength, payloadPtr );
+    status = receiveRecordFromDialin( NVDATAMGMT_SYSTEM_RECORD, currentMessage, totalMessages, payloadLength, payloadPtr );
 
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
@@ -5548,7 +5656,7 @@
         // Tester must be logged in
         if ( TRUE == isTestingActivated() )
         {
-            result = getSystemRecord();
+            result = sendRecordToDialin( NVDATAMGMT_SYSTEM_RECORD );
         }
     }
 
@@ -5639,7 +5747,7 @@
         // Tester must be logged in
         if ( TRUE == isTestingActivated() )
         {
-            result = getServiceRecord();
+            result = sendRecordToDialin( NVDATAMGMT_SERVICE_RECORD );
         }
     }
 
@@ -5705,7 +5813,7 @@
     memcpy(&payloadLength, payloadPtr, sizeof(U32));
     payloadPtr += sizeof(U32);
 
-    status = setServiceRecord( currentMessage, totalMessages, payloadLength, payloadPtr );
+    status = receiveRecordFromDialin( NVDATAMGMT_SERVICE_RECORD, currentMessage, totalMessages, payloadLength, payloadPtr );
 
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
@@ -6784,6 +6892,39 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleSetFansDutyCycleOverrideRequest function handles a
+ * request to override the fans duty cycle.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleSetFansDutyCycleOverrideRequest( 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 = testSetFansDutyCycleOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetFansDutyCycleOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleTestCurrentTreamtmentParametersRequest function handles a
  * request to retrieve the current treatment parameters.
  * @details Inputs: none