Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r3d131237935eb36e56e0d057a713430e31dc6405 -r6190a4ad94521b74164f1e1fbd79ed359c7c27fb
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 3d131237935eb36e56e0d057a713430e31dc6405)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 6190a4ad94521b74164f1e1fbd79ed359c7c27fb)
@@ -22,6 +22,7 @@
 #include "ModeFault.h"
 #include "ModeStandby.h"
 #include "OperationModes.h"
+#include "Pressures.h"
 #include "Reservoirs.h"
 #include "ROPump.h"
 #include "SystemComm.h"
@@ -54,13 +55,16 @@
 static U32 waterSampleStartTime = 0;                                        ///< Time stamp for start of water sample state.
 static U32 filterFlushStartTime = 0;                                        ///< Time stamp for start of filter flush state.
 static U32 filterFlushPublishTimerCounter = 0;                              ///< Filter flush data publish timer counter.
+/// Filter flush time period in ms.
+static OVERRIDE_U32_T filterFlushTimePeriod = { FILTER_FLUSH_TIME_MS, FILTER_FLUSH_TIME_MS, 0, 0 };
 
 // ********** private function prototypes **********
 
 static DG_STANDBY_MODE_STATE_T handleStandbyIdleState( void );
 static DG_STANDBY_MODE_STATE_T handleStandbyFlushFilterState( void );
 static DG_STANDBY_MODE_STATE_T handleStandbyFlushFilterIdleState( void );
 static DG_STANDBY_MODE_STATE_T handleStandbySampleWaterState( void );
+static U32 getFilterFlushTimePeriod( void );
 
 /*********************************************************************//**
  * @brief
@@ -189,15 +193,19 @@
 static DG_STANDBY_MODE_STATE_T handleStandbyFlushFilterState( void )
 {
     DG_STANDBY_MODE_STATE_T state = DG_STANDBY_MODE_STATE_FLUSH_FILTER;
+    U32 const filterFlushTimePeriod_ms = getFilterFlushTimePeriod();
 
-    if ( TRUE == didTimeout( filterFlushStartTime, FILTER_FLUSH_TIME_MS ) )
+    checkInletPressure();
+
+    if ( TRUE == didTimeout( filterFlushStartTime, filterFlushTimePeriod_ms ) )
     {
+        setValveState( VPI, VALVE_STATE_CLOSED );
         state = DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE;
     }
 
     if ( FILTER_FLUSH_DATA_PUBLISH_INTERVAL <= filterFlushPublishTimerCounter++ )
     {
-        U32 const timeout = FILTER_FLUSH_TIME_MS / MS_PER_SECOND;
+        U32 const timeout = filterFlushTimePeriod_ms / MS_PER_SECOND;
         U32 const countdown = timeout - ( calcTimeSince( filterFlushStartTime ) / MS_PER_SECOND );
         filterFlushPublishTimerCounter = 0;
 
@@ -257,6 +265,7 @@
     // After HD requests to stop or 10 seconds has elapsed, close and return to idle state
     if ( ( TRUE == stopSampleWaterRequest ) || ( TRUE == didTimeout( waterSampleStartTime, MAX_WATER_SAMPLE_TIME_MS ) ) )
     {
+        stopSampleWaterRequest = FALSE;
         setValveState( VSP, VALVE_STATE_CLOSED );
 
 #ifndef V_2_SYSTEM
@@ -430,4 +439,74 @@
     return standbyState;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFilterFlushTimePeriod function gets the filter flush time period.
+ * @details Inputs: filterFlushTimePeriod
+ * @details Outputs: none
+ * @return the current filter flush time period (in ms).
+ *************************************************************************/
+static U32 getFilterFlushTimePeriod( void )
+{
+    U32 result = filterFlushTimePeriod.data;
+
+    if ( OVERRIDE_KEY == filterFlushTimePeriod.override )
+    {
+        result = filterFlushTimePeriod.ovData;
+    }
+
+    return result;
+}
+
+
+/*************************************************************************
+ *                       TEST SUPPORT FUNCTIONS
+ *************************************************************************/
+
+
+/*********************************************************************//**
+ * @brief
+ * The testSetFilterFlushTimePeriodOverride function overrides the filter
+ * flush time period.
+ * @details Inputs: none
+ * @details Outputs: filterFlushTimePeriod
+ * @param value override concentrate pump data publish interval with (in ms)
+ * @return TRUE if override successful, FALSE if not
+ *************************************************************************/
+BOOL testSetFilterFlushTimePeriodOverride( U32 value )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        filterFlushTimePeriod.override = OVERRIDE_KEY;
+        filterFlushTimePeriod.ovData = value;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The testResetFilterFlushTimePeriodOverride function resets the
+ * override of the filter flush time period.
+ * @details Inputs: none
+ * @details Outputs: filterFlushTimePeriod
+ * @return TRUE if override reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetFilterFlushTimePeriodOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        filterFlushTimePeriod.override = OVERRIDE_RESET;
+        filterFlushTimePeriod.ovData = filterFlushTimePeriod.ovInitData;
+    }
+
+    return result;
+}
+
 /**@}*/