Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -recb538c8bf67a7a62d11a1186a9ef5fe53cf9d9e -r5b3943e71ba8e09bc3311d9a464afa5f08ed08e4
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision ecb538c8bf67a7a62d11a1186a9ef5fe53cf9d9e)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 5b3943e71ba8e09bc3311d9a464afa5f08ed08e4)
@@ -58,6 +58,9 @@
 #define ROP_FLOW_TO_PWM_PCT(flow)               ( ( ROP_FLOW_TO_PWM_SLOPE * log(flow) + ROP_FLOW_TO_PWM_INTERCEPT ) / MAX_FLUID_PUMP_PWM_DUTY_CYCLE )    ///< PWM line equation for flow converted to percentage.
 #define ROP_FLOW_TO_PWM(flow)                   ( ROP_FLOW_TO_PWM_SLOPE * log(flow) + ROP_FLOW_TO_PWM_INTERCEPT )                                        ///< PWM line equation for flow converted to percentage.
 
+#define FP_FLOW_RATE_BELOW_TARGET_TIMEOUT_MS        ( 10 * MS_PER_SECOND )                                              ///< Timeout for flow rate below 75% of target flow rate
+#define FP_FLOW_RATE_BELOW_TARGET_CLEAR_MS          ( 10 * MS_PER_SECOND )                                              ///< Clear timeout for flow rate below target flow rate 
+
 // ********** private data **********
 
 static RO_PUMP_STATE_T roPumpState;                                                                 ///< Current state of pump controller state machine.
@@ -105,6 +108,8 @@
     initializePIController( PI_CONTROLLER_ID_RO_PUMP_PRES, MIN_FLUID_PUMP_DUTY_CYCLE_PCT, ROP_PRESSURE_CONTROL_P_COEFFICIENT, ROP_PRESSURE_CONTROL_I_COEFFICIENT,
                             MIN_FLUID_PUMP_DUTY_CYCLE_PCT, MAX_FLUID_PUMP_DUTY_CYCLE_PCT, FALSE, 0 );
 
+    initPersistentAlarm( ALARM_ID_FP_PERMEATE_FLOW_RATE_BELOW_TARGET, FP_FLOW_RATE_BELOW_TARGET_CLEAR_MS, FP_FLOW_RATE_BELOW_TARGET_TIMEOUT_MS );
+
     roPumpState                                 = RO_PUMP_OFF_STATE;
     isROPumpOn                                  = FALSE;
     stopPumpRequest                             = FALSE;
@@ -280,6 +285,9 @@
 {
     RO_PUMP_STATE_T state = RO_PUMP_CONTROL_TO_TARGET_FLOW_STATE;
     F32 nexttgtflow = 0.0;
+    F32 currentFlowRate = 0.0;
+    F32 targtetFlowRate = 0.0;
+    BOOL isFlowRateLow = FALSE;
 
     // Check if need to switch control modes
     if ( getTargetROPumpPressure() > 0.0F )
@@ -302,10 +310,13 @@
     }
     else if ( ++roControlTimerCounter >= ROP_CONTROL_INTERVAL )
     {
+        currentFlowRate = getFilteredFlow( P16_FLOW );
+	targtetFlowRate = (F32)getTargetROPumpFlowRateMLPM() * ROP_MIN_FLOW_TO_CONTROL_PCT;
+
         // P16 flow seems to lag in current Leahi HW. We will wait till we hit a % of target flow before we start changing control.
-        if( ( TRUE == roPumpStartControl ) || ( getFilteredFlow( P16_FLOW ) >= ( (F32)getTargetROPumpFlowRateMLPM() * ROP_MIN_FLOW_TO_CONTROL_PCT ) ) )
+        if( ( TRUE == roPumpStartControl ) || ( currentFlowRate >= ( targtetFlowRate ) ) )
         {
-            roPumpDutyCyclePctSet = runPIController( PI_CONTROLLER_ID_RO_PUMP_FLOW, (F32)getTargetROPumpFlowRateMLPM(), getFilteredFlow( P16_FLOW ) );
+            roPumpDutyCyclePctSet = runPIController( PI_CONTROLLER_ID_RO_PUMP_FLOW, (F32)getTargetROPumpFlowRateMLPM(), currentFlowRate );
             roPumpDutyCyclePctSet = MIN( roPumpDutyCyclePctSet, ( MAX_FLUID_PUMP_PWM_DUTY_CYCLE * MAX_FLUID_PUMP_DUTY_CYCLE_PCT ) );
             setFluidPumpPctToPWMDutyCycle( P12_PUMP, roPumpDutyCyclePctSet );
 
@@ -315,6 +326,11 @@
             }
         }
         roControlTimerCounter = 0;
+
+        //is flow rate less than 75% of the target flow rate
+        // wait for 10 seconds for timeout
+        isFlowRateLow = ( ( currentFlowRate  < ( targtetFlowRate ) ) ? TRUE : FALSE);
+        checkPersistentAlarm( ALARM_ID_FP_PERMEATE_FLOW_RATE_BELOW_TARGET, isFlowRateLow, currentFlowRate, targtetFlowRate);
     }
 
     return state;