Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -r850f74b97895fd0f6c4728541ac2582f7b5c5a0b -r24b2fe72608344e67ef37234085d15ad5e4fcc37
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 850f74b97895fd0f6c4728541ac2582f7b5c5a0b)
+++ firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 24b2fe72608344e67ef37234085d15ad5e4fcc37)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 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
+* @file    ModeTreatmentParams.c
 *
-* @author (last) Sean Nash
-* @date (last) 14-Oct-2020
+* @author  (last)      Behrouz NematiPour
+* @date    (last)      04-Jan-2022
 *
-* @author (original) Sean Nash
-* @date (original) 29-May-2020
+* @author  (original)  Sean Nash
+* @date    (original)  29-May-2020
 *
 ***************************************************************************/
 
@@ -59,15 +59,16 @@
     { 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=0},    {.sInt=-300} }, // TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT
-    { CRITICAL_DATA_TYPE_S32, {.sInt=-300}, {.sInt=0},    {.sInt=0}    }, // TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT
-    { CRITICAL_DATA_TYPE_S32, {.sInt=20},   {.sInt=600},  {.sInt=20}   }, // TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT
-    { CRITICAL_DATA_TYPE_S32, {.sInt=20},   {.sInt=600},  {.sInt=400}  }, // TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT
+    { CRITICAL_DATA_TYPE_S32, {.sInt=-300}, {.sInt=-30},  {.sInt=-300} }, // TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT
+    { CRITICAL_DATA_TYPE_S32, {.sInt=-270}, {.sInt=100},  {.sInt=100}  }, // TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT
+    { CRITICAL_DATA_TYPE_S32, {.sInt=20},   {.sInt=570},  {.sInt=20}   }, // TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT
+    { CRITICAL_DATA_TYPE_S32, {.sInt=50},   {.sInt=600},  {.sInt=400}  }, // TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT
     { CRITICAL_DATA_TYPE_F32, {.sFlt=0.0},  {.sFlt=1.0},  {.sFlt=0.0}  }, // TREATMENT_PARAM_HEPARIN_DISPENSE_RATE
     { CRITICAL_DATA_TYPE_F32, {.sFlt=0.0},  {.sFlt=2.0},  {.sFlt=0.0}  }, // TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME
     { CRITICAL_DATA_TYPE_F32, {.sFlt=35.0}, {.sFlt=38.0}, {.sFlt=37.0} }, // TREATMENT_PARAM_DIALYSATE_TEMPERATURE
@@ -116,9 +117,9 @@
  * parameters mode.
  * @details Inputs: none
  * @details Outputs: Treatment Parameters mode reset prior to starting
- * @return none
+ * @return initial state
  *************************************************************************/
-void transitionToTreatParamsMode( void )
+U32 transitionToTreatParamsMode( void )
 {
     // Reset this mode
     initTreatParamsMode();
@@ -132,10 +133,14 @@
     treatParamsRejected = FALSE;
     treatmentCancelled = FALSE;
 
+    setTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME, 0.0 );
+
     // Set user alarm recovery actions allowed in this mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, FALSE );
+
+    return currentTreatmentParamsState;
 }
 
 /*********************************************************************//**
@@ -343,7 +348,7 @@
         TREATMENT_PARAM_T param;
 
         // Set all treatment parameters (except UF volume which is not yet received)
-        for ( param = TREATMENT_PARAM_FIRST_UINT; param < TREATMENT_PARAM_UF_VOLUME; param++ )
+        for ( param = TREATMENT_PARAM_FIRST_UINT; param < NUM_OF_TREATMENT_PARAMS; param++ )
         {
             setCriticalData( &treatmentParameters[ param ], stagedParams[ param ] );
         }
@@ -401,16 +406,16 @@
 {
     BOOL accepted = FALSE;
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NONE;
-    F32  uFVolumeL = uFVolumeMl / (F32)ML_PER_LITER;
+    F32 uFVolumeL = uFVolumeMl / (F32)ML_PER_LITER;
 
     // Validate given UF volume
     accepted = setTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME, uFVolumeL );
-    if ( FALSE == accepted )
+
+    if ( TRUE == accepted )
     {
-        rejReason = REQUEST_REJECT_REASON_UF_VOLUME_OUT_OF_RANGE;
-    }
-    else
-    {
+        // 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 )
@@ -429,6 +434,10 @@
             rejReason = REQUEST_REJECT_REASON_TREATMENT_TIME_LESS_THAN_MINIMUM;
         }
     }
+    else
+    {
+        rejReason = REQUEST_REJECT_REASON_UF_VOLUME_OUT_OF_RANGE;
+    }
 
     // Respond to set treatment parameters request message
     uFVolumeL = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME );
@@ -829,7 +838,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
  *************************************************************************/