Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -rd182ea22d168c4a6522993f8a0a362586e87e591 -r971fc9950b919f8b54ff88a627f6cb1e8a0906ee
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision d182ea22d168c4a6522993f8a0a362586e87e591)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 971fc9950b919f8b54ff88a627f6cb1e8a0906ee)
@@ -7,8 +7,8 @@
 *
 * @file    ModeHeatDisinfect.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      13-Jun-2022
+* @author  (last)      Bill Bracken
+* @date    (last)      22-Aug-2022
 *
 * @author  (original)  Sean
 * @date    (original)  20-Apr-2020
@@ -162,14 +162,14 @@
 static BOOL areRsrvrsLeaking = FALSE;                                                                          ///< Reservoir 1 & 2 leak check flag during heat disinfect.
 static U32 dataPublishCounter = 0;                                                                             ///< Heat Disinfect data publish counter.
 static CANCELLATION_MODE_T cancellationMode = CANCELLATION_MODE_NONE;                                          ///< Cancellation mode.
-static U32 rsrvrFillStableTimeCounter = 0;                                                                     ///< Reservoirs fill stable time counter.
+static U32 rsrvrFillStableTimeCounter;                                                                         ///< Reservoirs fill stable time counter.
 static ALARM_ID_T alarmDetectedPendingTrigger;                                                                 ///< Heat disinfect alarm to raise.
 static BOOL isDrainPumpInMixDrainOn = FALSE;                                                                   ///< Flag to indicate the drain pump is on during mix drain.
 static U32 ROFCirculationTimer = 0;                                                                            ///< RO filter circulation timer.
 static U32 ROFCoolingTimer = 0;                                                                                ///< RO filter cooling timer.
 static BOOL hasROFCirculationBeenStarted = FALSE;                                                              ///< Flag to indicate the water in RO filter has been recirculated.
 static U32 targetDisinfectTime = 0;                                                                            ///< Target disinfect time.
-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.
 static U32 tempGradOutOfRangeTimer;                                                                            ///< Temperature gradient out of range start timer.
 
 // ********** private function prototypes **********
@@ -222,29 +222,30 @@
  *************************************************************************/
 void initHeatDisinfectMode( void )
 {
-    heatDisinfectState           = DG_HEAT_DISINFECT_STATE_START;
-    prevHeatDisinfectState       = DG_HEAT_DISINFECT_STATE_START;
-    heatDisinfectUIState         = HEAT_DISINFECT_UI_STATE_NOT_RUNNING;
-    stateTimer                   = 0;
-    isThisLastDrain              = FALSE;
-    stateTrialCounter            = 0;
-    areTempSensorsInRange        = FALSE;
-    rsrvr1Status                 = NUM_OF_DG_RESERVOIR_STATUS;
-    rsrvr2Status                 = NUM_OF_DG_RESERVOIR_STATUS;
-    R1HeatDisinfectVol           = 0.0;
-    R2HeatDisinfectVol           = 0.0;
-    overallHeatDisinfectTimer    = 0;
-    cancellationMode             = CANCELLATION_MODE_NONE;
-    rsrvrFillStableTimeCounter   = 0;
-    isPartialDisinfectInProgress = FALSE;
-    isDrainPumpInMixDrainOn      = FALSE;
-    ROFCirculationTimer          = 0;
-    ROFCoolingTimer              = 0;
-    hasROFCirculationBeenStarted = FALSE;
-    concentratePumpsPrimeTimer   = 0;
-    targetDisinfectTime          = 0;
-    haveDrainParamsBeenInit      = FALSE;
-    tempGradOutOfRangeTimer      = 0;
+    heatDisinfectState                          = DG_HEAT_DISINFECT_STATE_START;
+    prevHeatDisinfectState                      = DG_HEAT_DISINFECT_STATE_START;
+    heatDisinfectUIState                        = HEAT_DISINFECT_UI_STATE_NOT_RUNNING;
+    stateTimer                                  = 0;
+    isThisLastDrain                             = FALSE;
+    stateTrialCounter                           = 0;
+    areTempSensorsInRange                       = FALSE;
+    rsrvr1Status                                = NUM_OF_DG_RESERVOIR_STATUS;
+    rsrvr2Status                                = NUM_OF_DG_RESERVOIR_STATUS;
+    R1HeatDisinfectVol                          = 0.0;
+    R2HeatDisinfectVol                          = 0.0;
+    overallHeatDisinfectTimer                   = 0;
+    cancellationMode                            = CANCELLATION_MODE_NONE;
+    rsrvrFillStableTimeCounter                  = 0;
+    isPartialDisinfectInProgress                = FALSE;
+    isDrainPumpInMixDrainOn                     = FALSE;
+    ROFCirculationTimer                         = 0;
+    ROFCoolingTimer                             = 0;
+    hasROFCirculationBeenStarted                = FALSE;
+    concentratePumpsPrimeTimer                  = 0;
+    targetDisinfectTime                         = 0;
+    haveDrainParamsBeenInit[ DG_RESERVOIR_1 ]   = FALSE;
+    haveDrainParamsBeenInit[ DG_RESERVOIR_2 ]   = FALSE;
+    tempGradOutOfRangeTimer                     = 0;
 }
 
 /*********************************************************************//**
@@ -450,9 +451,9 @@
     // Set all the actuators to reset and de-energized state
     deenergizeActuators();
 
-    // If the inlet pressure is less than the threshold and TDi and TRo difference is greater than 3 C, the cycle
+    // If the inlet pressure is less than or equal to the threshold or TDi and TRo difference is greater than 3 C, the cycle
     // should be canceled
-    if ( ( ppiPressure < MIN_INLET_PRESSURE_PSI ) && ( fabs( TDiTemp - TRoTemp ) > MAX_START_STATE_TEMP_SENSORS_DIFF_C ) )
+    if ( ( ppiPressure <= MIN_INLET_PRESSURE_PSI ) || ( fabs( TDiTemp - TRoTemp ) > MAX_START_STATE_TEMP_SENSORS_DIFF_C ) )
     {
         prevHeatDisinfectState      = state;
         alarmDetectedPendingTrigger = ALARM_ID_DG_HEAT_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT;
@@ -465,6 +466,7 @@
 
         // Close VPi to prevent wasting water
         setValveState( VPI, VALVE_STATE_CLOSED );
+        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC);
 
         // Set the actuators to drain R1
         setValveState( VRD1, VALVE_STATE_OPEN );
@@ -508,7 +510,6 @@
             setValveState( VPI, VALVE_STATE_OPEN );
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
             setValveState( VRD1, VALVE_STATE_CLOSED );
-            setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
             setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
             setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
 
@@ -537,6 +538,8 @@
             state = DG_HEAT_DISINFECT_STATE_DRAIN_R2;
         }
 
+        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC);
+
         // Start the timer
         stateTimer = getMSTimerCount();
     }
@@ -591,6 +594,7 @@
             stateTimer = getMSTimerCount();
             state = DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN;
         }
+        setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
     }
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr2Status )
     {
@@ -866,7 +870,7 @@
         // 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 ) )
+        if ( ( volume >= RSRVRS_PARTIAL_FILL_VOL_ML ) && ( 0 == drainPumpRPM ) )
         {
             prevHeatDisinfectState = state;
             alarmDetectedPendingTrigger = ALARM_ID_DG_INVALID_LOAD_CELL_VALUE;
@@ -1564,7 +1568,7 @@
         // 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 ) )
+        if ( ( volume >= RSRVRS_PARTIAL_FILL_VOL_ML ) && ( 0 == drainPumpRPM ) )
         {
             prevHeatDisinfectState = state;
             alarmDetectedPendingTrigger = ALARM_ID_DG_INVALID_LOAD_CELL_VALUE;
@@ -1584,7 +1588,7 @@
             // De-energize all the valves and set the VDr to drain R2
             setValveState( VPI, VALVE_STATE_CLOSED );
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
-            setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
+            setValveState( VPO, VALVE_STATE_FILL_C_TO_NC);
             setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRD2, VALVE_STATE_OPEN );
             setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
@@ -1849,18 +1853,18 @@
     {
         if ( ++rsrvrFillStableTimeCounter >= RSRVRS_FULL_STABLE_TIME_COUNT )
         {
-            status = DG_RESERVOIR_REACHED_TARGET;
+            status                     = DG_RESERVOIR_REACHED_TARGET;
             rsrvrFillStableTimeCounter = 0;
             // Set the state timer in case it needs to be used for another timeout check
-            stateTimer = getMSTimerCount();
+            stateTimer                 = getMSTimerCount();
         }
     }
     else if ( TRUE == didTimeout( stateTimer, timeout ) )
     {
         // Failed to fill ontime. Update the previous heat disinfect state and transition to basic cancellation
-        prevHeatDisinfectState = heatDisinfectState;
+        prevHeatDisinfectState      = heatDisinfectState;
         alarmDetectedPendingTrigger = ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT;
-        status = DG_RESERVOIR_NOT_REACHED_TARGET;
+        status                      = DG_RESERVOIR_NOT_REACHED_TARGET;
     }
 
     return status;
@@ -1885,28 +1889,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
-        stateTimer              = getMSTimerCount();
-        haveDrainParamsBeenInit = FALSE;
-        status                  = DG_RESERVOIR_REACHED_TARGET;
+        stateTimer                   = getMSTimerCount();
+        haveDrainParamsBeenInit[ r ] = FALSE;
+        status                       = DG_RESERVOIR_REACHED_TARGET;
     }
     else if ( TRUE == didTimeout( stateTimer, timeout ) )
     {
         // Failed to drain on time. Update the previous heat disinfect state and transition to basic cancellation
-        prevHeatDisinfectState      = heatDisinfectState;
-        alarmDetectedPendingTrigger = ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT;
-        haveDrainParamsBeenInit     = FALSE;
-        status                      = DG_RESERVOIR_NOT_REACHED_TARGET;
+        prevHeatDisinfectState           = heatDisinfectState;
+        alarmDetectedPendingTrigger      = ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT;
+        haveDrainParamsBeenInit[ r ]     = FALSE;
+        status                           = DG_RESERVOIR_NOT_REACHED_TARGET;
     }
 
     return status;