Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -r0ce5d84e500f57bd28c376cde71860d94a443f1e -rcf2feb4325923f7a08d05a2bf543722147e8c18d
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 0ce5d84e500f57bd28c376cde71860d94a443f1e)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision cf2feb4325923f7a08d05a2bf543722147e8c18d)
@@ -8,7 +8,7 @@
 * @file    ModeFlush.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      18-Jan-2023
+* @date    (last)      27-Feb-2023
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  20-Dec-2019
@@ -145,7 +145,7 @@
     prevFlushState                            = DG_FLUSH_STATE_START;
     flushUIState                              = FLUSH_UI_STATE_NOT_RUNNING;
     rsrvrFillStableTimeCounter                = 0;
-    overallFlushElapsedTimeStart              = 0;
+    overallFlushElapsedTimeStart              = getMSTimerCount();
     isThisInitialDrain                        = TRUE;
     dataPublishCounter                        = 0;
     rsrvr1Status                              = NUM_OF_DG_RESERVOIR_STATUS;
@@ -154,7 +154,7 @@
     flushLinesVolumeL                         = 0.0F;
     haveDrainParamsBeenInit[ DG_RESERVOIR_1 ] = FALSE;
     haveDrainParamsBeenInit[ DG_RESERVOIR_2 ] = FALSE;
-    stateTimerStart                           = 0;
+    stateTimerStart                           = getMSTimerCount();
     hasFlushStatusBeenWrittenToNV             = FALSE;
 }
 
@@ -1019,8 +1019,8 @@
  * The getRsrvrDrainStatus function returns the status of draining a
  * reservoir. If the drain times out, it set the status to did not reach
  * target.
- * @details Inputs: rsrvrFillStableTimeCounter, alarm, stateTimer
- * @details Outputs: rsrvrFillStableTimeCounter, alarm, stateTimer,
+ * @details Inputs: alarm, stateTimer
+ * @details Outputs: alarm, stateTimer,
  * prevFlushState
  * @param r is DG_RESERVOIR_1 or DG_RESERVOIR_2
  * @param drainSteadyStateTimeout which is the time the reservoir's level