Index: firmware/App/Modes/ModePreGenPermeate.c
===================================================================
diff -u -rdfec1cd93855e2b0aebfb2303f5fc8584a012440 -r6dd382e3988fac2f9ee041b4738d67305e17a6a2
--- firmware/App/Modes/ModePreGenPermeate.c	(.../ModePreGenPermeate.c)	(revision dfec1cd93855e2b0aebfb2303f5fc8584a012440)
+++ firmware/App/Modes/ModePreGenPermeate.c	(.../ModePreGenPermeate.c)	(revision 6dd382e3988fac2f9ee041b4738d67305e17a6a2)
@@ -27,6 +27,7 @@
 #include "Messaging.h"
 #include "ModeGenPermeate.h"
 #include "ModePreGenPermeate.h"
+#include "PermeateTank.h"
 #include "ROPump.h"
 #include "TaskGeneral.h"
 #include "Timers.h"
@@ -40,8 +41,8 @@
 // ********** private definitions **********
 
 #define PRE_GENP_DATA_PUBLISH_INTERVAL     ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )    ///< Interval (ms/task time) at which the pre gen Permeate mode data published.
-#define VERIFY_WATER_RO_PUMP_TGT_PSI       15
-#define VERIFY_WATER_BOOST_PUMP_TGT_PSI    25
+#define VERIFY_WATER_RO_PUMP_TGT_FLOW_ML   700                                          ///< Target flow rate for RO pump in ml/min
+#define VERIFY_WATER_BOOST_PUMP_TGT_PSI    25                                           ///< Target pressure for boost pump in psi.
 #define VERIFY_WATER_TIMEOUT_MS            ( 5 * MS_PER_SECOND )
 
 // ********** private data **********
@@ -97,6 +98,7 @@
     initPreGenPMode();
     setCurrentSubState( preGenPState );
     setModePreGenPTransition( preGenPState );
+    resetPermeateTank();
     return preGenPState;
 }
 
@@ -199,7 +201,7 @@
             {
                 setBoostPumpTargetPressure( VERIFY_WATER_BOOST_PUMP_TGT_PSI );
             }
-            setROPumpTargetPressure( VERIFY_WATER_RO_PUMP_TGT_PSI );
+            setROPumpTargetFlowRateMLPM( VERIFY_WATER_RO_PUMP_TGT_FLOW_ML );
             verifyWaterTimer = getMSTimerCount();
             break;
 
@@ -223,10 +225,10 @@
 {
     FP_PRE_GENP_MODE_STATE_T state = FP_PRE_GENP_INLET_PRESSURE_CHECK;
 
-    if ( TRUE == 1 )// Alarm Change
-    {
-        state = FP_PRE_GENP_PAUSED;
-    }
+//    if ( TRUE == 1 ))// TODO Alarm and Stop State Rework
+//    {
+//        state = FP_PRE_GENP_PAUSED;
+//    }
 
     if ( FALSE == isBoostPumpInstalled() )
     {
@@ -251,10 +253,10 @@
 {
     FP_PRE_GENP_MODE_STATE_T state = FP_PRE_GENP_FILTER_FLUSH;
 
-    if ( TRUE == 1 )// Alarm Change
-    {
-        state = FP_PRE_GENP_PAUSED;
-    }
+//    if ( TRUE == 1 ))// TODO Alarm and Stop State Rework
+//    {
+//        state = FP_PRE_GENP_PAUSED;
+//    }
 
     execFilterFlush();
 
@@ -279,10 +281,10 @@
 {
     FP_PRE_GENP_MODE_STATE_T state = FP_PRE_GENP_PERMEATE_FLUSH;
 
-    if ( TRUE == 1 )// Alarm Change
-    {
-        state = FP_PRE_GENP_PAUSED;
-    }
+//    if ( TRUE == 1 ))// TODO Alarm and Stop State Rework
+//    {
+//        state = FP_PRE_GENP_PAUSED;
+//    }
 
     execPermeateFlush();
 
@@ -307,10 +309,10 @@
 {
     FP_PRE_GENP_MODE_STATE_T state = FP_PRE_GENP_CONCENTRATE_FLUSH;
 
-    if ( TRUE == 1 )// Alarm Change
-    {
-        state = FP_PRE_GENP_PAUSED;
-    }
+//    if ( TRUE == 1 ))// TODO Alarm and Stop State Rework
+//    {
+//        state = FP_PRE_GENP_PAUSED;
+//    }
 
     execConcentrateFlush();
 
@@ -335,14 +337,13 @@
     FP_PRE_GENP_MODE_STATE_T state = FP_PRE_GENP_VERIFY_WATER;
     F32 roCurrentDutyCycle = getCurrentROPumpDutyCyclePCT();
 
-    if ( TRUE == 1 )// Alarm Change
-    {
-        state = FP_PRE_GENP_PAUSED;
-    }
+//    if ( TRUE == 1 ))// TODO Alarm and Stop State Rework
+//    {
+//        state = FP_PRE_GENP_PAUSED;
+//    }
 
     if( TRUE == didTimeout( verifyWaterTimer, VERIFY_WATER_TIMEOUT_MS ) )
     {
-        setGenPermeateRODutyCycle( roCurrentDutyCycle );
         transitionToGenPermeateMode();
         requestGenWaterStart(); // transition function will clear start flag
         isPreGenComplete = TRUE;