Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rd33ae635eb38ae8f2647f68304be74e8e4f78cfd -r15f9827c863812cfd1f891d22342103fe9a72abc
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d33ae635eb38ae8f2647f68304be74e8e4f78cfd)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 15f9827c863812cfd1f891d22342103fe9a72abc)
@@ -2409,7 +2409,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?
@@ -2717,6 +2717,8 @@
     return result;
 }
 
+
+
 /*********************************************************************//**
  * @brief
  * The handleChangeUFSettingsRequest function handles a ultrafiltration
@@ -5233,6 +5235,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 );
@@ -6923,4 +6926,50 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleTestCurrentTreamtmentParametersRequest function handles a
+ * request to retrieve the current treatment parameters.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+
+void handleTestCurrentTreamtmentParametersRequest( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+    // verify payload length
+    if ( 0 == message->hdr.payloadLen )
+    {
+        result = TRUE;
+        // ACK request
+        result = testUpdateCurrentTreatmentParameters();
+    }
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The sendTestCurrentTreatmentParametersResponse function constructs a current
+ * treatment parameter response message to the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: current treatment prameters response msg constructed and queued.
+ * @param data response data record
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+
+BOOL sendTestCurrentTreatmentParametersResponse(CURRENT_TREATMENT_PARAMS_DATA_PAYLOAD_T current_params)
+{
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_RES_CURRENT_TREATMENT_PARAMETERS;
+    msg.hdr.payloadLen = sizeof(CURRENT_TREATMENT_PARAMS_DATA_PAYLOAD_T);
+    memcpy(payloadPtr, &current_params, sizeof(CURRENT_TREATMENT_PARAMS_DATA_PAYLOAD_T));
+
+    return serializeMessage(msg, COMM_BUFFER_OUT_CAN_PC, ACK_REQUIRED );
+}
+
 /**@}*/