Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -r549b7594d3c9fc908cc95aec23bb131590334879 -r9279d01e7e539ad1e788b85db4ea2288965b03c6
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 549b7594d3c9fc908cc95aec23bb131590334879)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 9279d01e7e539ad1e788b85db4ea2288965b03c6)
@@ -8,7 +8,7 @@
 * @file    ModeDrain.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      01-Jan-2022
+* @date    (last)      25-Feb-2022
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  20-Dec-2019
@@ -44,25 +44,26 @@
 #define DRAIN_EMPTY_TARE_WAIT           ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )             /// Time period to wait after drain complete and before taring load cells.
 
 #define TARGET_RO_PRESSURE_PSI          130                                                   ///< Target pressure for RO pump.
-#define TARGET_RO_FLOW_RATE_L           0.3                                                   ///< Target flow rate for RO pump.
+#define TARGET_RO_FLOW_RATE_L           0.3F                                                  ///< Target flow rate for RO pump.
 
 #define DELAY_RES_DRAIN_VALVE_MS        1000                                                  ///< Delay reservoir drain valve open by 1 second.
 #define DELAY_DRAIN_PUMP_MS             2000                                                  ///< Delay drain pump on by 2 seconds.
 
 #define DIALYSATE_DRAIN_TIME_OUT        ( 2 * SEC_PER_MIN * MS_PER_SECOND )                   ///< Dialysate drain time out.
 
-/// Time period to wait for concentrate lines to rinse.
-#define RINSE_CONCENTRATE_LINES_WAIT    ( 25 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )
-/// Reserver the concentrate speed to rinse out concentrate lines.
-#define RINSE_SPEED                     ( ( CONCENTRATE_PUMP_MAX_SPEED - 3.0 ) * -1.0 )
+#define RINSE_CONCENTRATE_LINES_WAIT    ( 25 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )        ///< Time period to wait for concentrate lines to rinse.
 
+#define RINSE_SPEED                     ( ( CONCENTRATE_PUMP_MAX_SPEED - 3.0F ) * -1.0F )     ///< Reserver the concentrate speed to rinse out concentrate lines.
+
 // ********** private data **********
 
 static DG_DRAIN_STATE_T drainState;                                                           ///< Currently active drain state.
 static U32 drainEmptyTareTimerCtr;                                                            ///< Timer counter for delay between drain complete and load cell tare.
 static BOOL rinseConcentrateLines;                                                            ///< Flag indicates to rinse concentrate lines.
 static U32 rinseConcentrateLinesTimerCtr;                                                     ///< Timer counter for rinsing concentrate lines.
 static U32 dialysateDrainStartTime;                                                           ///< Dialysate drain start time.
+static BOOL rinseConcentrateLines;                                                            ///< Flag indicates to rinse concentrate lines.
+static U32 rinseConcentrateLinesTimerCtr;                                                     ///< Timer counter for rinsing concentrate lines.
 
 // ********** private function prototypes **********
 static DG_DRAIN_STATE_T handleDrainStateStart( void );
@@ -109,6 +110,9 @@
     {
         setValveStateDelayed( VRD2, VALVE_STATE_OPEN, DELAY_RES_DRAIN_VALVE_MS );
     }
+
+    initDrainParameters( inactiveReservoir );
+
     // set initial actuator states
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setDrainPumpTargetRPMDelayed( TARGET_DRAIN_PUMP_RPM, DELAY_DRAIN_PUMP_MS );