Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -rb306a0de592542e6805afde6ddb8e886f3b91c63 -rcc7f1bd82e346521f0102b3398bd030fb3bb0e6f
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision b306a0de592542e6805afde6ddb8e886f3b91c63)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision cc7f1bd82e346521f0102b3398bd030fb3bb0e6f)
@@ -7,8 +7,8 @@
 *
 * @file    Rinseback.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      12-Nov-2021
+* @author  (last)      Dara Navaei
+* @date    (last)      03-Mar-2022
 *
 * @author  (original)  Sean Nash
 * @date    (original)  20-Jan-2021
@@ -37,10 +37,10 @@
 
 // ********** private definitions **********
 
-#define TUBING_RINSEBACK_VOLUME_ML                   80.0                   ///< Target rinseback volume to deliver back to the patient (in mL).
-#define MAX_TOTAL_ADDITIONAL_RINSEBACK_VOLUME_ML    300.0                   ///< Maximum total additional rinseback volume allowed : all additionals (in mL).
-#define MAX_RINSEBACK_VOLUME_ERROR_ML                60.0                   ///< Maximum error in total additional rinseback volume (20% of total).
-#define TARGET_ADDITIONAL_RINSEBACK_VOLUME_ML        10.0                   ///< Target rinseback volume for an additional volume request (in mL).
+#define TUBING_RINSEBACK_VOLUME_ML                   80.0F                  ///< Target rinseback volume to deliver back to the patient (in mL).
+#define MAX_TOTAL_ADDITIONAL_RINSEBACK_VOLUME_ML    300.0F                  ///< Maximum total additional rinseback volume allowed : all additionals (in mL).
+#define MAX_RINSEBACK_VOLUME_ERROR_ML                60.0F                  ///< Maximum error in total additional rinseback volume (20% of total).
+#define TARGET_ADDITIONAL_RINSEBACK_VOLUME_ML        10.0F                  ///< Target rinseback volume for an additional volume request (in mL).
 #define RINSEBACK_FLOW_RATE_ADJ_ML_MIN               25                     ///< Adjustment amount (in mL/min) to apply when user requests increase/decrease in flow rate.
 #define MIN_RINSEBACK_FLOW_RATE_ML_MIN               50                     ///< Minimum rinseback flow rate (in mL/min).
 #define MAX_RINSEBACK_FLOW_RATE_ML_MIN               150                    ///< Maximum rinseback flow rate (in mL/min).
@@ -56,15 +56,15 @@
 /// Maximum time allowed for each additional rinseback volume delivery.
 static const U32 MAX_RINSEBACK_ADDITIONAL_TIME    = ( 20 * MS_PER_SECOND / TASK_GENERAL_INTERVAL );
 /// Multiplier to convert flow (mL/min) into volume (mL) for period of general task interval.
-static const F32 RINSEBACK_FLOW_INTEGRATOR        = 1.0 / (F32)( SEC_PER_MIN * ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) );
+static const F32 RINSEBACK_FLOW_INTEGRATOR        = 1.0F / (F32)( SEC_PER_MIN * ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) );
 
 // ********** private data **********
 
 static RINSEBACK_STATE_T rinsebackState;                                    ///< Current state of the rinseback sub-mode.
 static U32  rinsebackRate_mL_min;                                           ///< Rinseback rate to use/adjust for this current rinseback only.
 static U32  rinsebackTimerCtr;                                              ///< Timer counter for time spent in rinseback sub-mode.
 
-static F32  rinsebackTargetVolume_mL = 300.0;                               ///< Calculated target rinseback volume (based on selected dialyzer and fixed tubing volume).
+static F32  rinsebackTargetVolume_mL;                                       ///< Calculated target rinseback volume (based on selected dialyzer and fixed tubing volume).
 static OVERRIDE_F32_T  cumulativeRinsebackVolume_mL = { 0.0, 0.0, 0.0, 0 }; ///< Total cumulative rinseback volume (in mL) from measured blood flow rate.
 static F32  expectedRinsebackVolume_mL = 0.0;                               ///< Total cumulative rinseback volume (in mL) expected based on target blood flow rate.
 static F32  targetRinsebackVolumePlusAdditional_mL;                         ///< Target rinseback volume w/ additional volume(s) added (in mL).
@@ -135,6 +135,7 @@
     totalAdditionalRinsebackVolume_mL = 0.0;
     rinsebackAdditionalTimerCtr = 0;
     rinsebackPublishTimerCtr = 0;
+    rinsebackTargetVolume_mL = 300.0;
     resetRinsebackFlags();
 }
 
@@ -401,13 +402,17 @@
         result = RINSEBACK_PAUSED_STATE;
     }
     // Is rinseback taking too long?
-    else if ( ( fabs( expectedRinsebackVolume_mL - getRinsebackVolume() ) > MAX_RINSEBACK_VOLUME_ERROR_ML ) &&
-              ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
+    else if ( fabs( expectedRinsebackVolume_mL - getRinsebackVolume() ) > MAX_RINSEBACK_VOLUME_ERROR_ML )
     {
-        setRinsebackIsCompleted( TRUE );
-        setupForRinsebackStopOrPause();
-        activateAlarmNoData( ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE );
-        result = RINSEBACK_STOP_STATE;
+#ifndef _RELEASE_
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+        {
+            setRinsebackIsCompleted( TRUE );
+            setupForRinsebackStopOrPause();
+            activateAlarmNoData( ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE );
+            result = RINSEBACK_STOP_STATE;
+        }
     }
     // Otherwise, continue rinseback
     else