Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -r61716bc97ecca8af1ec560333844a8cf602eccb0 -rf15b66d94af1b415f57a7cc37372dba4fa793fbe
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 61716bc97ecca8af1ec560333844a8cf602eccb0)
+++ firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision f15b66d94af1b415f57a7cc37372dba4fa793fbe)
@@ -909,8 +909,65 @@
             }
         }
     }
-
     return result;
 }
 
+BOOL testUpdateCurrentTreatmentParameters( void )
+{
+   BOOL result = FALSE;
+   CURRENT_TREATMENT_PARAMS_DATA_PAYLOAD_T current_treatment_params;
+   // Test one parameter for set since all parameters are set after parameter validation.
+   if(TRUE == isCriticalDataSet( &treatmentParameters[TREATMENT_PARAM_BLOOD_FLOW] ))
+   {
+       result = TRUE;
+       current_treatment_params.accepted = TRUE;
+       current_treatment_params.treatment_parameters.bloodFlowRate_mL_min = getTreatmentParameterU32(TREATMENT_PARAM_BLOOD_FLOW);
+       current_treatment_params.treatment_parameters.dialysateFlowRate_mL_min = getTreatmentParameterU32(TREATMENT_PARAM_DIALYSATE_FLOW);
+       current_treatment_params.treatment_parameters.treatmentDuration_min = getTreatmentParameterU32(TREATMENT_PARAM_TREATMENT_DURATION);
+       current_treatment_params.treatment_parameters.heparinPreStop_min = getTreatmentParameterU32(TREATMENT_PARAM_HEPARIN_PRE_STOP_TIME);
+       current_treatment_params.treatment_parameters.salineBolusVolume_mL = getTreatmentParameterU32(TREATMENT_PARAM_SALINE_BOLUS_VOLUME);
+       current_treatment_params.treatment_parameters.acidConcentrate = getTreatmentParameterU32(TREATMENT_PARAM_ACID_CONCENTRATE);
+       current_treatment_params.treatment_parameters.bicarbConcentrate = getTreatmentParameterU32(TREATMENT_PARAM_BICARB_CONCENTRATE);
+       current_treatment_params.treatment_parameters.dialyzerType = getTreatmentParameterU32(TREATMENT_PARAM_DIALYZER_TYPE);
+       current_treatment_params.treatment_parameters.heparinType = getTreatmentParameterU32(TREATMENT_PARAM_HEPARIN_TYPE);
+       current_treatment_params.treatment_parameters.bloodPressureMeasurementInterval_min = getTreatmentParameterU32(TREATMENT_PARAM_BP_MEAS_INTERVAL);
+       current_treatment_params.treatment_parameters.rinsebackFlowRate_mL_min = getTreatmentParameterU32(TREATMENT_PARAM_RINSEBACK_FLOW_RATE);
+       current_treatment_params.treatment_parameters.arterialPressureLowLimit_mmHg = getTreatmentParameterS32(TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT);
+       current_treatment_params.treatment_parameters.arterialPressureHighLimit_mmHg = getTreatmentParameterS32(TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT);
+       current_treatment_params.treatment_parameters.venousPressureLowLimit_mmHg = getTreatmentParameterS32(TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT);
+       current_treatment_params.treatment_parameters.venousPressureHighLimit_mmHg = getTreatmentParameterS32(TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT);
+       current_treatment_params.treatment_parameters.heparinDispenseRate_mL_hr = getTreatmentParameterF32(TREATMENT_PARAM_HEPARIN_DISPENSE_RATE);
+       current_treatment_params.treatment_parameters.heparinBolusVolume_mL = getTreatmentParameterF32(TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME);
+       current_treatment_params.treatment_parameters.dialysateTemperature_degC = getTreatmentParameterF32(TREATMENT_PARAM_DIALYSATE_TEMPERATURE);
+       current_treatment_params.uFVolume_L = getTreatmentParameterF32(TREATMENT_PARAM_UF_VOLUME);
+   }
+   else
+   {
+       current_treatment_params.accepted = FALSE;
+       current_treatment_params.treatment_parameters.bloodFlowRate_mL_min = 0;
+       current_treatment_params.treatment_parameters.dialysateFlowRate_mL_min = 0;
+       current_treatment_params.treatment_parameters.treatmentDuration_min = 0;
+       current_treatment_params.treatment_parameters.heparinPreStop_min = 0;
+       current_treatment_params.treatment_parameters.salineBolusVolume_mL = 0;
+       current_treatment_params.treatment_parameters.acidConcentrate = 0;
+       current_treatment_params.treatment_parameters.bicarbConcentrate = 0;
+       current_treatment_params.treatment_parameters.dialyzerType = 0;
+       current_treatment_params.treatment_parameters.heparinType = 0;
+       current_treatment_params.treatment_parameters.bloodPressureMeasurementInterval_min = 0;
+       current_treatment_params.treatment_parameters.rinsebackFlowRate_mL_min = 0;
+       current_treatment_params.treatment_parameters.arterialPressureLowLimit_mmHg = 0;
+       current_treatment_params.treatment_parameters.arterialPressureHighLimit_mmHg = 0;
+       current_treatment_params.treatment_parameters.venousPressureLowLimit_mmHg = 0;
+       current_treatment_params.treatment_parameters.venousPressureHighLimit_mmHg = 0;
+       current_treatment_params.treatment_parameters.heparinDispenseRate_mL_hr = 0;
+       current_treatment_params.treatment_parameters.heparinBolusVolume_mL = 0;
+       current_treatment_params.treatment_parameters.dialysateTemperature_degC = 0;
+       current_treatment_params.uFVolume_L = 0;
+   }
+   sendTestCurrentTreatmentParametersResponse(current_treatment_params);
+   return result;
+}
+
+
+
 /**@}*/
Index: firmware/App/Modes/ModeTreatmentParams.h
===================================================================
diff -u -r24b2fe72608344e67ef37234085d15ad5e4fcc37 -rf15b66d94af1b415f57a7cc37372dba4fa793fbe
--- firmware/App/Modes/ModeTreatmentParams.h	(.../ModeTreatmentParams.h)	(revision 24b2fe72608344e67ef37234085d15ad5e4fcc37)
+++ firmware/App/Modes/ModeTreatmentParams.h	(.../ModeTreatmentParams.h)	(revision f15b66d94af1b415f57a7cc37372dba4fa793fbe)
@@ -72,6 +72,17 @@
     F32 uFVolume_L;                             ///< Original ultrafiltration volume (in L) set by user before treatment start
 } ADJ_TREATMENT_PARAMS_T;
 
+
+/// Record structure for current treatment parameters
+typedef struct
+{
+    U32 accepted;                                           ///< Accepted or rejected based on if critical data has been set.
+    TREATMENT_PARAMS_DATA_PAYLOAD_T treatment_parameters;   ///< Record structure of treatment parameters
+    F32 uFVolume_L;                                         ///< Current ultrafiltration volume (in L).
+
+} CURRENT_TREATMENT_PARAMS_DATA_PAYLOAD_T;
+
+
 // ********** Public function prototypes **********
 
 void initTreatParamsMode( void );                                                   // Initialize this module
@@ -97,6 +108,7 @@
 F32 getUltrafiltrationRateOriginal( void );                                               // Get/calculate the original ultrafiltration rate, by ultrafiltration volume and treatment duration set in pre-treatment mode by user.
 
 BOOL testSetTreatmentParameter( TREATMENT_PARAM_T param, CRITICAL_DATAS_T value );  // Set a specific treatment parameter value
+BOOL testUpdateCurrentTreatmentParameters();                                        // Update current treatment parameters
 
 /**@}*/
 
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r61716bc97ecca8af1ec560333844a8cf602eccb0 -rf15b66d94af1b415f57a7cc37372dba4fa793fbe
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 61716bc97ecca8af1ec560333844a8cf602eccb0)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision f15b66d94af1b415f57a7cc37372dba4fa793fbe)
@@ -1613,6 +1613,10 @@
                 handleTestFansRPMAlarmStartTimeOffsetOverrideRequest( message );
                 break;
 
+            case MSG_ID_HD_REQ_CURRENT_TREATMENT_PARAMETERS:
+                handleTestCurrentTreamtmentParametersRequest( message );
+                break;
+
             default:
                 // Unrecognized message ID received - ignore
                 break;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r61716bc97ecca8af1ec560333844a8cf602eccb0 -rf15b66d94af1b415f57a7cc37372dba4fa793fbe
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 61716bc97ecca8af1ec560333844a8cf602eccb0)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f15b66d94af1b415f57a7cc37372dba4fa793fbe)
@@ -2615,6 +2615,8 @@
     return result;
 }
 
+
+
 /*********************************************************************//**
  * @brief
  * The handleChangeUFSettingsRequest function handles a ultrafiltration
@@ -6780,4 +6782,44 @@
     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
+        sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+        result = testUpdateCurrentTreatmentParameters();
+    }
+    else
+    {
+        sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+    }
+}
+
+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 );
+}
+
 /**@}*/
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r61716bc97ecca8af1ec560333844a8cf602eccb0 -rf15b66d94af1b415f57a7cc37372dba4fa793fbe
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 61716bc97ecca8af1ec560333844a8cf602eccb0)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision f15b66d94af1b415f57a7cc37372dba4fa793fbe)
@@ -37,6 +37,7 @@
 #include "ModePreTreat.h"
 #include "ModeStandby.h"
 #include "ModeTreatment.h"
+#include "ModeTreatmentParams.h"
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"
 #include "PresOccl.h"
@@ -764,6 +765,12 @@
 // MSG_ID_HD_FAN_RPM_ALARM_START_TIME_OVERRIDE
 void handleTestFansRPMAlarmStartTimeOffsetOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_HD_REQ_CURRENT_TREATMENT_PARAMETERS
+void handleTestCurrentTreamtmentParametersRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_RES_CURRENT_TREATMENT_PARAMETERS
+BOOL sendTestCurrentTreatmentParametersResponse(CURRENT_TREATMENT_PARAMS_DATA_PAYLOAD_T current_params);
+
 /**@}*/
 
 #endif