Index: firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c
===================================================================
diff -u -rdd0e9acd5f0fb570403be8908ac45e79840d4b70 -rfb0f180eb25dbcfd15d58ef584d535efd1c24e30
--- firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c	(.../ModePreGenPermeateDefeatured.c)	(revision dd0e9acd5f0fb570403be8908ac45e79840d4b70)
+++ firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c	(.../ModePreGenPermeateDefeatured.c)	(revision fb0f180eb25dbcfd15d58ef584d535efd1c24e30)
@@ -15,8 +15,10 @@
 *
 ***************************************************************************/
 
+#include "FlushFilterDefeatured.h"
 #include "FPModeStandby.h"
 #include "FPOperationModes.h"
+#include "InletPressureCheck.h"
 #include "Messaging.h"
 #include "MessageSupport.h"
 #include "ModeGenPermeateDefeatured.h"
@@ -42,8 +44,6 @@
 static U32 preGenPermeateDefDataPublicationTimerCounter;                                           ///< Used to schedule generate Permeate data publication to CAN bus.
 static OVERRIDE_U32_T preGenPermeateDefDataPublishInterval;                                        ///< Generate permeate mode data publish interval.
 static BOOL pendingStartPreGenDefRequest;                                                          ///< Flag indicating DD has requested FP start the generate permeate.
-static U32 preGenPermeateDefFlushTimer;
-static U32 preGenPermeateDefWaterCheckTimer;
 
 // ********** private function prototypes **********
 
@@ -64,16 +64,14 @@
  *************************************************************************/
 void initPreGenPermeateDefeaturedMode( void )
 {
-    preGenPermeateDefState                            = FP_PRE_GENP_INLET_PRESSURE_CHECK;
+    preGenPermeateDefState                            = FP_PRE_GENP_DEF_INLET_PRESSURE_CHECK;
     preGenPermeateDefDataPublishInterval.data         = PRE_GEN_DEF_PERMEATE_DATA_PUBLISH_INTERVAL;
     preGenPermeateDefDataPublishInterval.ovData       = PRE_GEN_DEF_PERMEATE_DATA_PUBLISH_INTERVAL;
     preGenPermeateDefDataPublishInterval.ovInitData   = 0;
     preGenPermeateDefDataPublishInterval.override     = OVERRIDE_RESET;
     preGenPermeateDefDataPublicationTimerCounter      = 0;
     pendingStartPreGenDefRequest                      = FALSE;
-    preGenPermeateDefFlushTimer                       = 0;
-    preGenPermeateDefWaterCheckTimer                  = 0;
-}
+ }
 
 /*********************************************************************//**
  * @brief
@@ -169,7 +167,6 @@
             setValveState( P34_VALV, VALVE_STATE_CLOSED );
             setValveState( P37_VALV, VALVE_STATE_CLOSED );
             setValveState( P39_VALV, VALVE_STATE_CLOSED );
-            preGenPermeateDefFlushTimer = getMSTimerCount();
             break;
 
         case FP_PRE_GENP_DEF_PAUSED:
@@ -200,16 +197,11 @@
 {
     FP_PRE_GENP_DEF_MODE_STATE_T state = FP_PRE_GENP_DEF_INLET_PRESSURE_CHECK;
 
-//    if ( TRUE == 1 ))// TODO Alarm and Stop State Rework
-//    {
-//        state = FP_PRE_GENP_PAUSED;
-//    }
-
     execInletPressureCheck();
 
     if ( TRUE == isInletPressureCheckCompleted() )
     {
-        signalStartFilterFlush();
+        signalStartDefFilterFlush();
         state = FP_PRE_GENP_DEF_FLUSH;
     }
 
@@ -220,21 +212,17 @@
  * @brief
  * The handlePreGenPDefFlushState handles the supply water of gen permeate
  * defeatured mode.
- * @details \b Inputs:  preGenPermeateDefFlushTimer
+ * @details \b Inputs:  none
  * @details \b Outputs: none
  * @return the next state of gen water defeatured mode
  *************************************************************************/
 static FP_PRE_GENP_DEF_MODE_STATE_T handlePreGenPDefFlushState( void )
 {
     FP_PRE_GENP_DEF_MODE_STATE_T state = FP_PRE_GENP_DEF_FLUSH;
 
-//    if ( TRUE == 1 )// TODO Alarm and Stop State Rework
-//    {
-//        state = FP_PRE_GENP_DEF_PAUSED;
-//    }
-    //checkInletPressures(); TODO
+    execFilterFlushDefeatured();
 
-    if( TRUE == didTimeout( preGenPermeateDefFlushTimer, PRE_GEN_DEF_FLUSH_TIMEOUT_MS ) )
+    if ( TRUE == isFilterFlushDefComplete() )
     {
         transitionToGenPermeateDefeaturedMode();
         requestGenWaterDefStart();