Index: firmware/App/Monitors/WaterQualityMonitor.c
===================================================================
diff -u -r3417933e6edf61a914c428e2fa944b3b349272a4 -r39405d73782b8b9cf1fc26238640e683efcebbb5
--- firmware/App/Monitors/WaterQualityMonitor.c	(.../WaterQualityMonitor.c)	(revision 3417933e6edf61a914c428e2fa944b3b349272a4)
+++ firmware/App/Monitors/WaterQualityMonitor.c	(.../WaterQualityMonitor.c)	(revision 39405d73782b8b9cf1fc26238640e683efcebbb5)
@@ -36,8 +36,8 @@
 
 #define INLET_TEMPERATURE_LOW_THRESHOLD_C                            5.0F                                                    ///< Minimum allowed Inlet temperature in C.
 #define INLET_TEMPERATURE_HIGH_THRESHOLD_C                           30.0F                                                   ///< Maximum allowed Inlet temperature in C.
-#define INLET_TEMPERATURE_PERSISTENCE_TIMER_MS                       ( 5 * MS_PER_SECOND / TASK_PRIORITY_INTERVAL )          ///< Persistence timer to trigger alarm in ms.
-#define INLET_TEMPERATURE_PERSISTENCE_CLEAR_MS                       ( 5 * MS_PER_SECOND / TASK_PRIORITY_INTERVAL )          ///< Persistence timer to clear alarm in ms.
+#define INLET_TEMPERATURE_PERSISTENCE_TIMER_MS                       ( 5 * MS_PER_SECOND )                                   ///< Persistence timer to trigger alarm in ms.
+#define INLET_TEMPERATURE_PERSISTENCE_CLEAR_MS                       ( 5 * MS_PER_SECOND )                                   ///< Persistence timer to clear alarm in ms.
 
 #define MAX_INLET_RO_PUMP_PRESSURE_WARNING_PSIG                      120.0F                                                  ///< Maximum allowed Input pressure to the RO membrane.
 #define MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG                    25.0F                                                   ///< Minimum allowed Input warning low pressure value in psig for RO featured.
@@ -58,7 +58,13 @@
 #define INLET_WATER_COND_OUT_OF_RANGE_TIMEOUT_MS                     ( 5 * MS_PER_SECOND )                                   ///< Persistence period for conductivity out of range error in milliseconds.
 #define INLET_WATER_COND_OUT_OF_RANGE_CLEAR_MS                       ( 5 * MS_PER_SECOND )                                   ///< Persistence period for conductivity out of range clear in milliseconds.
 #define INLET_CONDUCTIVITY_HIGH_THRESHOLD_US                         2000.0F                                                 ///< Maximum allowed outlet conductivity in uS/cm.
+#define MIN_RO_REJECTION_RATIO_PCT                                   90.0F                                                   ///< Minimum RO rejection ration in percentage
 
+#define PERMEATE_FLOW_OUT_RANGE_PERSISTENCE_TIMEOUT_MS               ( 5 * MS_PER_SECOND )                                   ///< Verify Water timer ( in ms )
+#define PERMEATE_FLOW_OUT_RANGE_PERSISTENCE_CLEAR_MS                 ( 5 * MS_PER_SECOND )                                   ///< Verify Water timer ( in ms )
+#define PERMEATE_FLOW_FAULT_MIN_THRESHOLD                            200.0F                                                  ///< Permeate flow low tolerance limit
+#define PERMEATE_FLOW_OUT_OF_RANGE_TIMEOUT_MS                        ( 12 * MS_PER_SECOND )                                  ///< Permeate flow low tolerance out of range timeout
+
 // ********** private data **********
 
 // ********** private function prototypes **********
@@ -86,6 +92,11 @@
     // Conductivity Alarms
     initPersistentAlarm( ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_HIGH_RANGE, INLET_WATER_COND_OUT_OF_RANGE_CLEAR_MS, INLET_WATER_COND_OUT_OF_RANGE_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_FP_RO_OUTLET_CONDUCTIVITY_HIGH_RANGE, INLET_WATER_COND_OUT_OF_RANGE_CLEAR_MS, INLET_WATER_COND_OUT_OF_RANGE_TIMEOUT_MS );
+
+    //Flow Alarms
+    initPersistentAlarm( ALARM_ID_FP_PERMEATE_FLOW_OUT_HIGH_RANGE, PERMEATE_FLOW_OUT_RANGE_PERSISTENCE_CLEAR_MS, PERMEATE_FLOW_OUT_RANGE_PERSISTENCE_TIMEOUT_MS );
+    // fault , clearing timeout is not applicable
+    initPersistentAlarm( ALARM_ID_FP_PERMEATE_FLOW_OUT_LOW_RANGE, 0, PERMEATE_FLOW_OUT_OF_RANGE_TIMEOUT_MS );
 }
 
 /*********************************************************************//**
@@ -131,15 +142,15 @@
 
 /*********************************************************************//**
  * @brief
- * The checkPermeateFlow function checks the permeate flow rate from P16
- * against the set target flow rate and alarm if the flow is out of range.
+ * The checkPermeateHighFlow function checks the permeate flow rate from P16
+ * against the set target flow rate and alarm if the flow is out of range high.
  * @details \b Inputs: permeateFlow
  * @details \b Outputs: none
  * @details \b Alarms: ALARM_ID_FP_PERMEATE_FLOW_OUT_HIGH_RANGE when
  * P16 flow goes beyond threshold limit from set target flow.
  * @return none
  *************************************************************************/
-void checkPermeateFlow( void )
+void checkPermeateHighFlow( void )
 {
     F32 permeateFlow = getFilteredFlow( P16_FLOW );
     BOOL isFlowOutOfRange = FALSE;
@@ -151,6 +162,26 @@
 
 /*********************************************************************//**
  * @brief
+ * The checkPermeateLowFlow function checks the permeate low flow rate from P16
+ * against the set target flow rate and alarm if the flow is out of range.
+ * @details \b Inputs: permeateFlow
+ * @details \b Outputs: none
+ * @details \b Alarms: ALARM_ID_FP_PERMEATE_FLOW_OUT_LOW_RANGE when
+ * P16 flow goes beyond threshold limit from set target flow.
+ * @return none
+ *************************************************************************/
+void checkPermeateLowFlow( void )
+{
+    F32 permeateFlow = getFilteredFlow( P16_FLOW );
+    BOOL isFlowOutOfRange = FALSE;
+    F32 minimumAllowedPermeateFlow = (F32)getTargetROPumpFlowRateMLPM() - PERMEATE_FLOW_FAULT_MIN_THRESHOLD;
+
+    isFlowOutOfRange = ( ( permeateFlow < minimumAllowedPermeateFlow ) ? TRUE : FALSE);
+    checkPersistentAlarm( ALARM_ID_FP_PERMEATE_FLOW_OUT_LOW_RANGE, isFlowOutOfRange, permeateFlow, minimumAllowedPermeateFlow);
+}
+
+/*********************************************************************//**
+ * @brief
  * The checkROPressures function checks the RO membrane pressure
  * against the pressure threshold and alarm if the pressure is out of range.
  * @details \b Inputs: pressureP13
@@ -261,7 +292,27 @@
     checkPersistentAlarm( ALARM_ID_FP_RO_OUTLET_CONDUCTIVITY_HIGH_RANGE, isConductivityOutOfLowRange, conductivityP18, OUTLET_CONDUCTIVITY_HIGH_THRESHOLD_US );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The checkRORejectionRatio function checks the RO rejection ratio
+ * alarm if the rejection ratio is out of range.
+ * @details \b Inputs: roRRAvg
+ * @details \b Outputs: none
+ * @details \b Alarms: ALARM_ID_FP_REJECTION_RATIO_LOW_RANGE when
+ * RO rejection ratio goes below allowed rejection ratio limit.
+ * @return none
+ *************************************************************************/
+void checkRORejectionRatio( void )
+{
+    F32 avgRORR = getRORRAverage();
+    // Alarm if the filtered average is less than allowed RO rejection limit
+    if ( avgRORR < MIN_RO_REJECTION_RATIO_PCT )
+    {
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_REJECTION_RATIO_LOW_RANGE, avgRORR, MIN_RO_REJECTION_RATIO_PCT)
+    }
+}
 
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/