Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r3e1c314fa6d5254fa0dca9d41a41416666549f4e -r161a56481d1a194704b63a5fd55d4c5583fa94df
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3e1c314fa6d5254fa0dca9d41a41416666549f4e)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 161a56481d1a194704b63a5fd55d4c5583fa94df)
@@ -363,8 +363,8 @@
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED );
 
     return result;
-}
-
+}
+
 /*********************************************************************//**
  * @brief
  * The sendChangeBloodDialysateRateChangeResponse function constructs a change
@@ -1976,7 +1976,7 @@
         sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
     }
 }
-
+
 /*********************************************************************//**
  * @brief
  * The handleChangeBloodDialysateRateChangeRequest function handles a blood
@@ -2254,7 +2254,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_HD_RECIRC_CMD_RESPONSE;
+    msg.hdr.msgID = MSG_ID_HD_TX_END_CMD_RESPONSE;
     msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( U32 );
 
     memcpy( payloadPtr, &accepted, sizeof( BOOL ) );
@@ -3645,6 +3645,31 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleTestTreatmentTimeRemainingOverrideRequest function handles a treatment
+ * time remaining override request message.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestTreatmentTimeRemainingOverrideRequest( MESSAGE_T *message )
+{
+    U32  payload;
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof(U32) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(U32) );
+        result = testSetTreatmentTimeRemainingOverride( payload );
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleTestHDSafetyShutdownOverrideRequest function handles a
@@ -3773,84 +3798,6 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
-/*********************************************************************//**
- * @brief
- * The handleSetAccelCalibration function handles a request to set
- * accelerometer calibration factors.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleSetAccelCalibration( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-
-    // Verify payload length
-    if ( message->hdr.payloadLen == sizeof(ACCEL_CAL_PAYLOAD_T) )
-    {
-        ACCEL_CAL_PAYLOAD_T payload;
-
-        memcpy( &payload, message->payload, sizeof(ACCEL_CAL_PAYLOAD_T) );
-        result = setAccelCalibration( payload.xOffset, payload.yOffset, payload.zOffset );
-    }
-
-    // Respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
- * @brief
- * The handleSetBloodFlowCalibration function handles a request to set
- * blood flow calibration factors.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleSetBloodFlowCalibration( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-
-    // Verify payload length
-    if ( message->hdr.payloadLen == sizeof(LINEAR_F32_CAL_PAYLOAD_T) )
-    {
-        LINEAR_F32_CAL_PAYLOAD_T payload;
-
-        memcpy( &payload, message->payload, sizeof(LINEAR_F32_CAL_PAYLOAD_T) );
-        result = setBloodFlowCalibration( payload.gain, payload.offset );
-    }
-
-    // Respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
- * @brief
- * The handleSetDialysateFlowCalibration function handles a request to set
- * dialysate flow calibration factors.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleSetDialysateFlowCalibration( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-
-    // Verify payload length
-    if ( message->hdr.payloadLen == sizeof(LINEAR_F32_CAL_PAYLOAD_T) )
-    {
-        LINEAR_F32_CAL_PAYLOAD_T payload;
-
-        memcpy( &payload, message->payload, sizeof(LINEAR_F32_CAL_PAYLOAD_T) );
-        result = setDialInFlowCalibration( payload.gain, payload.offset );
-    }
-
-    // Respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
 /*************************************************************************
  * @brief
  * The handleTestSetTreatmentParameter function handles a request to set
@@ -4220,71 +4167,4 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
-/*********************************************************************//**
- * @brief
- * The handleTestHDCalibrationDataRequest function handles a request for
- * HD calibration data.
- * @details
- * Inputs : none
- * Outputs : message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleTestHDCalibrationDataRequest( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-
-    if ( 0 == message->hdr.payloadLen )
-    {
-        CALIBRATION_DATA_T cal;
-        MESSAGE_T msg;
-        U08 *payloadPtr = msg.payload;
-
-        // Get calibration data
-        result = getCalibrationData( &cal );
-        if ( TRUE == result )
-        {
-            // Create a message record
-            blankMessage( &msg );
-            msg.hdr.msgID = MSG_ID_HD_CALIBRATION_DATA;
-            msg.hdr.payloadLen = sizeof( CALIBRATION_DATA_T );
-
-            memcpy( payloadPtr, &cal, sizeof( CALIBRATION_DATA_T ) );
-
-            // 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_HD_BROADCAST, ACK_NOT_REQUIRED );
-        }
-    }
-
-    // Respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
- * @brief
- * The handleTestEraseHDCalibrationDataRequest function handles a request for
- * HD calibration data erasure.
- * @details
- * Inputs : none
- * Outputs : message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleTestEraseHDCalibrationDataRequest( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-
-    if ( message->hdr.payloadLen == sizeof(U32) )
-    {
-        U32 key;
-
-        memcpy( &key, message->payload, sizeof(U32) );
-
-        result = testResetCalibrationData( key );
-    }
-
-    // Respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
 /**@}*/