Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -r09e6cf9de34acf18f6e1138bf56ac0edb4821186 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 09e6cf9de34acf18f6e1138bf56ac0edb4821186)
+++ firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    ModeTreatmentParams.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      12-Nov-2021
+* @author  (last)      Behrouz NematiPour
+* @date    (last)      04-Jan-2022
 *
 * @author  (original)  Sean Nash
 * @date    (original)  29-May-2020
@@ -59,9 +59,10 @@
     { CRITICAL_DATA_TYPE_U32, {.uInt=60},   {.uInt=480},  {.uInt=240}  }, // TREATMENT_PARAM_TREATMENT_DURATION
     { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=480},  {.uInt=0}    }, // TREATMENT_PARAM_HEPARIN_PRE_STOP_TIME
     { CRITICAL_DATA_TYPE_U32, {.uInt=100},  {.uInt=300},  {.uInt=100}  }, // TREATMENT_PARAM_SALINE_BOLUS_VOLUME
-    { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=2},    {.uInt=0}    }, // TREATMENT_PARAM_ACID_CONCENTRATE
+    { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=3},    {.uInt=0}    }, // TREATMENT_PARAM_ACID_CONCENTRATE
     { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=0},    {.uInt=0}    }, // TREATMENT_PARAM_BICARB_CONCENTRATE
     { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=4},    {.uInt=0}    }, // TREATMENT_PARAM_DIALYZER_TYPE
+    { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=0},    {.uInt=0}    }, // TREATMENT_PARAM_HEPARIN_TYPE
     { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=60},   {.uInt=30}   }, // TREATMENT_PARAM_BP_MEAS_INTERVAL
     { CRITICAL_DATA_TYPE_U32, {.uInt=50},   {.uInt=150},  {.uInt=75}   }, // TREATMENT_PARAM_RINSEBACK_FLOW_RATE
     { CRITICAL_DATA_TYPE_S32, {.sInt=-300}, {.sInt=-30},  {.sInt=-300} }, // TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT
@@ -139,6 +140,9 @@
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, FALSE );
 
+    // Request the concentrate pumps mixing ratios and the DG fill mode prepare time
+    cmdRequestDGMixingRatios();
+
     return currentTreatmentParamsState;
 }
 
@@ -412,6 +416,9 @@
 
     if ( TRUE == accepted )
     {
+        // store the user set ultrafiltration volume in pre-treatment parameters setup, if it is validated, otherwise keep the initial 0.0
+        origTreatmentParams.uFVolume_L = uFVolumeL;
+
         U32 treatmentDuration = getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION );
 
         if ( treatmentDuration > 0 )
@@ -834,7 +841,36 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getUltrafiltrationVolumeOriginal function gets the floating point value
+ * of the original set treatment parameter's ultrafiltration volume by user in
+ * Pre-Treatment mode.
+ * @details Inputs: none
+ * @details Outputs: origTreatmentParams.uFVolume_L
+ * @param none
+ * @return the original ultrafiltration volume value in liter
+ *************************************************************************/
+F32 getUltrafiltrationVolumeOriginal( void )
+{
+    return origTreatmentParams.uFVolume_L;
+}
 
+/*********************************************************************//**
+ * @brief
+ * The getUltrafiltrationRateOriginal function gets the floating point value
+ * of the original ultrafiltration rate calculated by the set treatment parameter's
+ * ultrafiltration volume and treatment duration by user in Pre-Treatment mode.
+ * @details Inputs: origTreatmentParams.uFVolume_L, origTreatmentParams.treatmentDuration_min
+ * @details Outputs: none
+ * @param none
+ * @return the original ultrafiltration rate value in mL/min
+ *************************************************************************/
+F32 getUltrafiltrationRateOriginal( void )
+{
+    return ( ( origTreatmentParams.uFVolume_L * ML_PER_LITER ) / origTreatmentParams.treatmentDuration_min );
+}
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/