Index: firmware/App/Modes/FPModes/FlushPermeate.c
===================================================================
diff -u -r26dca0a06faa2a79443d7bf2bc547c8dab0673a2 -rbadf38264b5f9f238d46d860f165b1e1bb4311b7
--- firmware/App/Modes/FPModes/FlushPermeate.c	(.../FlushPermeate.c)	(revision 26dca0a06faa2a79443d7bf2bc547c8dab0673a2)
+++ firmware/App/Modes/FPModes/FlushPermeate.c	(.../FlushPermeate.c)	(revision badf38264b5f9f238d46d860f165b1e1bb4311b7)
@@ -27,6 +27,7 @@
 #include "TaskGeneral.h"
 #include "Timers.h"
 #include "Valves.h"
+#include "WaterQualityMonitor.h"
 
 /**
  *  @addtogroup FPPermeateFlush
@@ -146,11 +147,6 @@
     FP_PERM_FLUSH_STATE_T state = PERM_FLUSH_IN_PROGRESS;
     LEVEL_STATE_T level = getLevelStatus( P25_LEVL );
 
-//    if ( TRUE == 1 ))// TODO Alarm and Stop State Rework
-//    {
-//        state = PERM_FLUSH_PAUSED;
-//    }
-
     // Manual control of Permeate tank while in Permeate Flush
     // to prevent overfill.
     if ( LEVEL_STATE_HIGH == level )
@@ -174,12 +170,24 @@
             setBoostPumpTargetPressure( PERMEATE_FLUSH_BOOST_PUMP_TGT_PSI );
             isTankFilled = FALSE;
         }
+
+        checkROInletPressure();
     }
 
     if ( TRUE == didTimeout( permeateFlushTimer, getPermeateFlushTimeout() ) )
     {
         F32 p18conductivity = getFilteredConductivity( P18_COND );
-        //TODO add remaining checks per SRS-275
+        // SRS-275
+
+        // inlet water pressure range M3 25- 40 PSI
+        checkInletPressures();
+
+        // inlet water conductivity p9 < 2000
+        checkInletConductivity();
+
+        // inlet water temperature p10 range 5 - 30
+        checkInletTemperatures();
+
         if ( ( PERMEATE_FLUSH_CONDUCTIVITY_THRESHOLD > p18conductivity ) && ( LEVEL_STATE_HIGH == level ) )
         {
             isFlushComplete = TRUE;