Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -rf91baac9704a90ab0fea1dd05e11833ffc5a5a4e -r6d3a38303c448c14f9f64781dd39cbf2ac0fceec
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision f91baac9704a90ab0fea1dd05e11833ffc5a5a4e)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 6d3a38303c448c14f9f64781dd39cbf2ac0fceec)
@@ -49,14 +49,15 @@
 #define DRAIN_WEIGHT_UNCHANGE_TIMEOUT               ( 6 * MS_PER_SECOND )                             ///< Time period of unchanged weight during draining before timeout.
 
 // Flush drain path state defines
-#define FLUSH_DRAIN_WAIT_TIME_MS                    ( 2 * MS_PER_SECOND )                             ///< Flush Drain path wait time in milliseconds. TODo it was 2 minutes
+#define FLUSH_DRAIN_WAIT_TIME_MS                    ( 2 * 60 * MS_PER_SECOND )                        ///< Flush Drain path wait time in milliseconds.
 
 // Flush dialysate state defines
-#define FLUSH_DIALYSATE_WAIT_TIME_MS                ( 0.5F * 60 * MS_PER_SECOND )                     ///< Flush dialysate wait time in milliseconds.
+#define FLUSH_DIALYSATE_WAIT_TIME_MS                ( 60 * MS_PER_SECOND )                            ///< Flush dialysate wait time in milliseconds.
 
 // Flush concentrate straws state defines
-#define FLUSH_CONCENTRATE_STRAWS_TIME_MS            ( 0.5F * 60 * MS_PER_SECOND )                     ///< Flush concentrate straws wait time in milliseconds. todo was 3 minutes
+#define FLUSH_CONCENTRATE_STRAWS_TIME_MS            ( 3 * 60 * MS_PER_SECOND )                        ///< Flush concentrate straws wait time in milliseconds. todo was 3 minutes
 #define ACID_PUMP_SPEED_ML_PER_MIN                  -30.0F                                            ///< Acid pump speed in mL/min.
+
 // The bicarb pump is 2% faster than the acid pump to create a flow from acid to bicarb line during flush
 #define BICARB_PUMP_SPEED_ML_PER_MIN                30.6F                                             ///< Bicarb pump speed in mL/min.
 
@@ -94,7 +95,7 @@
 static U32 dataPublishCounter;                                                                        ///< Flush data publish counter.
 static BOOL hasWaterCancellationBeenSet;                                                              ///< Water cancellation set/not set boolean flag.
 static F32 flushLinesVolumeL;                                                                         ///< Volume of water pumped by RO pump during flush lines state.
-static BOOL haveDrainParamsBeenInit;                                                                  ///< Boolean flag to indicate whether the drain parameters have been reset or not.
+static BOOL haveDrainParamsBeenInit[ NUM_OF_DG_RESERVOIRS ];                                         ///< Boolean flag to indicate whether the drain parameters have been reset or not.
 
 // ********** private function prototypes **********
 
@@ -132,19 +133,20 @@
 void initFlushMode( void )
 {
     // Initialize the variables
-    flushState                   = DG_FLUSH_STATE_START;
-    prevFlushState               = DG_FLUSH_STATE_START;
-    flushUIState                 = FLUSH_UI_STATE_NOT_RUNNING;
-    rsrvrFillStableTimeCounter   = 0;
-    overallFlushElapsedTimeStart = 0;
-    isThisInitialDrain           = TRUE;
-    dataPublishCounter           = 0;
-    rsrvr1Status                 = NUM_OF_DG_RESERVOIR_STATUS;
-    rsrvr2Status                 = NUM_OF_DG_RESERVOIR_STATUS;
-    hasWaterCancellationBeenSet  = FALSE;
-    flushLinesVolumeL            = 0.0;
-    haveDrainParamsBeenInit      = FALSE;
-    stateTimerStart              = 0;
+    flushState                                  = DG_FLUSH_STATE_START;
+    prevFlushState                              = DG_FLUSH_STATE_START;
+    flushUIState                                = FLUSH_UI_STATE_NOT_RUNNING;
+    rsrvrFillStableTimeCounter                  = 0;
+    overallFlushElapsedTimeStart                = 0;
+    isThisInitialDrain                          = TRUE;
+    dataPublishCounter                          = 0;
+    rsrvr1Status                                = NUM_OF_DG_RESERVOIR_STATUS;
+    rsrvr2Status                                = NUM_OF_DG_RESERVOIR_STATUS;
+    hasWaterCancellationBeenSet                 = FALSE;
+    flushLinesVolumeL                           = 0.0;
+    haveDrainParamsBeenInit[ DG_RESERVOIR_1 ]   = FALSE;
+    haveDrainParamsBeenInit[ DG_RESERVOIR_2 ]   = FALSE;
+    stateTimerStart                             = 0;
 }
 
 /*********************************************************************//**
@@ -306,6 +308,7 @@
 
     // Close VPi to prevent wasting water
     setValveState( VPI, VALVE_STATE_CLOSED );
+
     // Set the actuators to drain R1
     setValveState( VRD1, VALVE_STATE_OPEN );
 
@@ -661,6 +664,10 @@
             turnOffUVReactor( INLET_UV_REACTOR );
             turnOffUVReactor( OUTLET_UV_REACTOR );
 
+            // Close VPi and VPd to drain
+            setValveState(VPI, VALVE_STATE_CLOSED);
+            setValveState(VPD, VALVE_STATE_DRAIN_C_TO_NO);
+
             stateTimerStart = getMSTimerCount();
             isThisInitialDrain = FALSE;
             rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
@@ -979,28 +986,28 @@
     DG_RESERVOIR_STATUS_T status = DG_RESERVOIR_ABOVE_TARGET;
 
     // If the drain parameters of the reservoir is not initialized, initialize them
-    if ( FALSE == haveDrainParamsBeenInit )
+    if ( FALSE == haveDrainParamsBeenInit [ r ] )
     {
         initDrainParameters( r );
-        haveDrainParamsBeenInit = TRUE;
+        haveDrainParamsBeenInit[ r ] = TRUE;
     }
 
     BOOL isDrainComplete = hasTargetDrainVolumeBeenReached( r, drainSteadyStateTimeout );
 
     if ( TRUE == isDrainComplete )
     {
         // Set the state timer in case it needs to be used for another timeout check
-        stateTimerStart         = getMSTimerCount();
-        haveDrainParamsBeenInit = FALSE;
-        status                  = DG_RESERVOIR_REACHED_TARGET;
+        stateTimerStart              = getMSTimerCount();
+        haveDrainParamsBeenInit[ r ] = FALSE;
+        status                       = DG_RESERVOIR_REACHED_TARGET;
     }
     else if ( TRUE == didTimeout( stateTimerStart, timeout ) )
     {
         // Failed to drain on time
-        prevFlushState              = flushState;
-        haveDrainParamsBeenInit     = FALSE;
-        alarmDetectedPendingTrigger = ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT;
-        status                      = DG_RESERVOIR_NOT_REACHED_TARGET;
+        prevFlushState                   = flushState;
+        haveDrainParamsBeenInit[ r ]     = FALSE;
+        alarmDetectedPendingTrigger      = ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT;
+        status                           = DG_RESERVOIR_NOT_REACHED_TARGET;
     }
 
     return status;