Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -rb77808c306061c4ee874ddb6608a7da803d26ee4 -r54abf84364e737dd350153d5fab7dd652f917ef4
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision b77808c306061c4ee874ddb6608a7da803d26ee4)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 54abf84364e737dd350153d5fab7dd652f917ef4)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2024 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)      Dara Navaei
-* @date    (last)      12-Jul-2023
+* @date    (last)      09-Sep-2024
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  20-Dec-2019
@@ -171,7 +171,7 @@
     deenergizeActuators( NO_PARK_CONC_PUMPS );
 
     initFlushMode();
-    setCurrentSubState( flushState );
+    setCurrentSubState( NO_SUB_STATE );
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_BLUE );
 
     return flushState;
@@ -573,18 +573,18 @@
 
     if ( DG_RESERVOIR_BELOW_TARGET == rsrvr1Status )
     {
+        F32 volumeML = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY );
+
         rsrvr1Status = getRsrvrFillStatus( DG_RESERVOIR_1, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS );
 
-        // Keep monitoring the status of reservoir 2 as the same time
-        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_PARTIAL_FILL_TIMEOUT_MS );
         // Reservoir 2 cannot be filled before reservoir 1 is filled and is overflowing to reservoir 2. If reservoir 2 has already
         // reached to target volume, it means reservoir 1's load cell might be reading incorrect values. This situation might continue
         // until reservoir 2 is filled up and the tubing might expand or leak.
-        if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
+        if ( volumeML >= RSRVRS_PARTIAL_FILL_VOL_ML )
         {
-            prevFlushState = state;
+            prevFlushState              = state;
             alarmDetectedPendingTrigger = ALARM_ID_DG_INVALID_LOAD_CELL_VALUE;
-            state = DG_FLUSH_STATE_CANCEL_WATER_PATH;
+            state                       = DG_FLUSH_STATE_CANCEL_WATER_PATH;
         }
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
@@ -661,21 +661,22 @@
     // First reservoir 2 must be completely full but if reservoir 1 is filled before reservoir 2 is full, alarm
     if ( DG_RESERVOIR_BELOW_TARGET == rsrvr2Status )
     {
-        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS );
-
         U32 drainPumpRPM = getDrainPumpTargetRPM();
         // Keep monitoring the status of reservoir 1 as the same time
         F32 volume = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
+
+        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS );
+
         // Reservoir 1 cannot be filled before reservoir 2 is filled and is overflowing to reservoir 1. If reservoir 1 has already
         // reached to target volume, it means reservoir 2's load cell might be reading incorrect values. This situation might continue
         // until reservoir 1 is filled up and the tubing might expand or leak.
         // Before checking whether reservoir 1 is filled pre-maturely, we have to make sure reservoir 1 is drained completely to make
         // sure the extra volume that is read is not because of previous water that is being drained currently and it is above 500 mL
         if ( ( volume >= RSRVRS_PARTIAL_FILL_VOL_ML ) && ( 0 == drainPumpRPM ) )
         {
-            prevFlushState = state;
+            prevFlushState              = state;
             alarmDetectedPendingTrigger = ALARM_ID_DG_INVALID_LOAD_CELL_VALUE;
-            state = DG_FLUSH_STATE_CANCEL_WATER_PATH;
+            state                       = DG_FLUSH_STATE_CANCEL_WATER_PATH;
         }
     }
     // Once reservoir 2 is full, reservoir 1 must be partially full
@@ -848,7 +849,7 @@
  * @details Inputs: rsrvr1Status, rsrvr2Status, stateTimer,
  * hasWaterCancellationBeenSet
  * @details Outputs: rsrvr1Status, rsrvr2Status, stateTimer,
- * hasWaterCancellationBeenSet
+ * hasWaterCancellationBeenSet, haveDrainParamsBeenInit
  * @return next state of the flush state machine
  *************************************************************************/
 static DG_FLUSH_STATE_T handleFlushModeCancelWaterPathState( void )
@@ -864,10 +865,13 @@
         setValveState( VPI, VALVE_STATE_CLOSED );
         setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
         setValveState( VRD2, VALVE_STATE_OPEN );
+        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
 
         // Set both reservoirs to be considered as full
-        rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
-        rsrvr2Status = DG_RESERVOIR_ABOVE_TARGET;
+        haveDrainParamsBeenInit[ DG_RESERVOIR_1 ] = FALSE;
+        haveDrainParamsBeenInit[ DG_RESERVOIR_2 ] = FALSE;
+        rsrvr1Status                              = DG_RESERVOIR_ABOVE_TARGET;
+        rsrvr2Status                              = DG_RESERVOIR_ABOVE_TARGET;
 
         // Water cancellation path was set
         hasWaterCancellationBeenSet = TRUE;
@@ -953,11 +957,14 @@
  *************************************************************************/
 static void failFlushMode( void )
 {
+    // If a fault alarm is active go to mode fault otherwise for cleaning mode alarms, transition to standby
+    DG_OP_MODE_T nextOpMode = ( FALSE == isDGFaultAlarmActive() ? DG_MODE_STAN : DG_MODE_FAUL );
+
     if ( alarmDetectedPendingTrigger != ALARM_ID_NO_ALARM )
     {
         SET_ALARM_WITH_1_U32_DATA( alarmDetectedPendingTrigger, prevFlushState )
     }
-    requestNewOperationMode( DG_MODE_STAN );
+    requestNewOperationMode( nextOpMode );
 }
 
 /*********************************************************************//**
@@ -1122,15 +1129,18 @@
     {
         if ( ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ) || ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ) )
         {
-            // Set the variables to fail and go to cancel water path. Set the pending alarm to no alarm so the cancel water path
-            // will not be raising the alarm at end of the cancel water path. The recoverable alarm is raised here in this function
-            prevFlushState              = flushState;
-            flushState                  = DG_FLUSH_STATE_CANCEL_WATER_PATH;
-            alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION;
-
-            if ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) )
+            if ( ( flushState != DG_FLUSH_STATE_CANCEL_WATER_PATH ) && ( flushState != DG_FLUSH_STATE_CANCEL_BASIC_PATH ) )
             {
-                alarmDetectedPendingTrigger = ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION;
+                // Set the variables to fail and go to cancel water path. Set the pending alarm to no alarm so the cancel water path
+                // will not be raising the alarm at end of the cancel water path. The recoverable alarm is raised here in this function
+                prevFlushState              = flushState;
+                flushState                  = DG_FLUSH_STATE_CANCEL_WATER_PATH;
+                alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION;
+
+                if ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) )
+                {
+                    alarmDetectedPendingTrigger = ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION;
+                }
             }
         }
     }