Index: firmware/App/Modes/ModeTreatmentParams.h
===================================================================
diff -u -rbd241ef5231a9869adaf7bb5ed166135beb2c0fb -rf2fc3885d55b51a6201c8f4f38e57cf7bcf3ee46
--- firmware/App/Modes/ModeTreatmentParams.h	(.../ModeTreatmentParams.h)	(revision bd241ef5231a9869adaf7bb5ed166135beb2c0fb)
+++ firmware/App/Modes/ModeTreatmentParams.h	(.../ModeTreatmentParams.h)	(revision f2fc3885d55b51a6201c8f4f38e57cf7bcf3ee46)
@@ -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
@@ -89,14 +100,17 @@
 BOOL setTreatmentParameterU32( TREATMENT_PARAM_T param, U32 value );                // Set a specified unsigned integer treatment parameter value
 BOOL setTreatmentParameterS32( TREATMENT_PARAM_T param, S32 value );                // Set a specified signed integer treatment parameter value
 BOOL setTreatmentParameterF32( TREATMENT_PARAM_T param, F32 value );                // Set a specified floating point treatment parameter value
-U32 getTreatmentParameterU32( TREATMENT_PARAM_T param );                            // Get a specified unsigned integer treatment parameter
-S32 getTreatmentParameterS32( TREATMENT_PARAM_T param );                            // Get a specified signed integer treatment parameter
-F32 getTreatmentParameterF32( TREATMENT_PARAM_T param );                            // Get a specified floating point treatment parameter
+U32  getTreatmentParameterU32( TREATMENT_PARAM_T param );                           // Get a specified unsigned integer treatment parameter
+S32  getTreatmentParameterS32( TREATMENT_PARAM_T param );                           // Get a specified signed integer treatment parameter
+F32  getTreatmentParameterF32( TREATMENT_PARAM_T param );                           // Get a specified floating point treatment parameter
 BOOL isTreatmentParamInRange( TREATMENT_PARAM_T param, CRITICAL_DATAS_T value );    // Check range for a proposed treatment parameter value
-F32 getUltrafiltrationVolumeOriginal( void );                                       // Get the original ultrafiltration volume, set in pre-treatment mode by user.
-F32 getUltrafiltrationRateOriginal( void );                                         // Get/calculate the original ultrafiltration rate, by ultrafiltration volume and treatment duration set in pre-treatment mode by user.
+S32  getS32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_T param );                // Get the lower range limit for a signed integer treatment parameter
+S32  getS32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_T param );                // Get the upper range limit for a signed integer treatment parameter
+F32  getUltrafiltrationVolumeOriginal( void );                                      // Get the original ultrafiltration volume, set in pre-treatment mode by user.
+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
 
 /**@}*/