Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -receb190a5d66fdbee779478ac8bb50a846ed9241 -r135b257c835e406f036dfbdec1d8cd9c51e1c526
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision eceb190a5d66fdbee779478ac8bb50a846ed9241)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 135b257c835e406f036dfbdec1d8cd9c51e1c526)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2023 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    ModeFlush.c
 *
-* @author  (last)      Steve Jarpe
-* @date    (last)      06-Dec-2022
+* @author  (last)      Dara Navaei
+* @date    (last)      27-Feb-2023
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  20-Dec-2019
@@ -51,7 +51,7 @@
 #define DRAIN_PUMP_TARGET_RPM                       2400                                              ///< Drain pump target RPM during drain.
 
 // Drain R1 & R2 states defines
-#define DRAIN_WEIGHT_UNCHANGE_TIMEOUT               ( 6 * MS_PER_SECOND )                             ///< Time period of unchanged weight during draining before timeout.
+#define DRAIN_WEIGHT_UNCHANGE_TIMEOUT_MS            ( 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 * 60 * MS_PER_SECOND )                        ///< Flush Drain path wait time in milliseconds.
@@ -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;
 }
 
@@ -361,7 +361,7 @@
 
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr1Status )
     {
-        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_DRAIN_TIMEOUT_MS );
+        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT_MS, RSRVRS_DRAIN_TIMEOUT_MS );
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
     {
@@ -407,7 +407,7 @@
 
      if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr2Status )
      {
-         rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_DRAIN_TIMEOUT_MS );
+         rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT_MS, RSRVRS_DRAIN_TIMEOUT_MS );
      }
      else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
      {
@@ -644,7 +644,7 @@
     // If reservoir 1 is empty, turn off the drain pump
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr1Status )
     {
-        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_DRAIN_TIMEOUT_MS );
+        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT_MS, RSRVRS_DRAIN_TIMEOUT_MS );
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
     {
@@ -885,7 +885,7 @@
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr2Status )
     {
         // If the cancellation water path cannot be done, got to basic cancellation path
-        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_DRAIN_TIMEOUT_MS );
+        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT_MS, RSRVRS_DRAIN_TIMEOUT_MS );
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
         {
@@ -902,7 +902,7 @@
     if ( ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status ) && ( DG_RESERVOIR_ABOVE_TARGET == rsrvr1Status ) )
     {
         // If the cancellation water path cannot be done, go to basic cancellation path
-        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_DRAIN_TIMEOUT_MS );
+        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT_MS, RSRVRS_DRAIN_TIMEOUT_MS );
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
         {
@@ -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
@@ -1032,6 +1032,7 @@
 static DG_RESERVOIR_STATUS_T getRsrvrDrainStatus( DG_RESERVOIR_ID_T r, U32 drainSteadyStateTimeout, U32 timeout )
 {
     DG_RESERVOIR_STATUS_T status = DG_RESERVOIR_ABOVE_TARGET;
+    BOOL isDrainComplete         = FALSE;
 
     // If the drain parameters of the reservoir is not initialized, initialize them
     if ( FALSE == haveDrainParamsBeenInit [ r ] )
@@ -1040,7 +1041,9 @@
         haveDrainParamsBeenInit[ r ] = TRUE;
     }
 
-    BOOL isDrainComplete = hasTargetDrainVolumeBeenReached( r, drainSteadyStateTimeout );
+    // NOTE: the drain status should be checked once the reservoirs parameters are initialized. This is to make sure the
+    // the timers for stable drain time are initialized prior to using them again
+    isDrainComplete = hasTargetDrainVolumeBeenReached( r, drainSteadyStateTimeout );
 
     if ( TRUE == isDrainComplete )
     {
@@ -1108,8 +1111,6 @@
  *************************************************************************/
 static void monitorModeFlush( void )
 {
-    BOOL areInletWaterAlarmsActive = FALSE;
-
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) != SW_CONFIG_ENABLE_VALUE )
 #endif
@@ -1125,14 +1126,7 @@
         }
     }
 
-    areInletWaterAlarmsActive |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_HIGH );
-    areInletWaterAlarmsActive |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_LOW );
-    areInletWaterAlarmsActive |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_HIGH );
-    areInletWaterAlarmsActive |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW );
-    areInletWaterAlarmsActive |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_HIGH );
-    areInletWaterAlarmsActive |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_LOW );
-
-    if ( ( TRUE == areInletWaterAlarmsActive ) )
+    if ( ( TRUE == isDGFaultAlarmActive() ) && ( flushState != DG_FLUSH_STATE_CANCEL_WATER_PATH ) )
     {
         prevFlushState = flushState;
         flushState     = DG_FLUSH_STATE_CANCEL_WATER_PATH;