Index: firmware/App/Monitors/WaterQualityMonitor.c =================================================================== diff -u -recb538c8bf67a7a62d11a1186a9ef5fe53cf9d9e -r38c8d303358e16782f9d6a1828ee1cc55a4e9a24 --- firmware/App/Monitors/WaterQualityMonitor.c (.../WaterQualityMonitor.c) (revision ecb538c8bf67a7a62d11a1186a9ef5fe53cf9d9e) +++ firmware/App/Monitors/WaterQualityMonitor.c (.../WaterQualityMonitor.c) (revision 38c8d303358e16782f9d6a1828ee1cc55a4e9a24) @@ -60,6 +60,9 @@ #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 0 ///< Verify Water timer ( in ms ) + // ********** private data ********** // ********** private function prototypes ********** @@ -87,6 +90,9 @@ // 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 ); } /*********************************************************************//** @@ -132,15 +138,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;