Index: AlarmDefs.h =================================================================== diff -u -rc298a34e4ee7b9e1ef4d5b17eb3b80df3e2db371 -r44c094762bca5c54881396f9373ae47991a59508 --- AlarmDefs.h (.../AlarmDefs.h) (revision c298a34e4ee7b9e1ef4d5b17eb3b80df3e2db371) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 44c094762bca5c54881396f9373ae47991a59508) @@ -475,7 +475,6 @@ { ALARM_PRIORITY_HIGH, 110, ALM_SRC_FP, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_PRESSURE_RELIEF_OUT_HIGH_RANGE }, { ALARM_PRIORITY_HIGH, 110, ALM_SRC_FP, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_POWER_BUDGET_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 110, ALM_SRC_FP, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_FLOW_RATE_LOW_RANGE }, - { ALARM_PRIORITY_HIGH, 110, ALM_SRC_FP, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_PERMEATE_FLOW_RATE_BELOW_TARGET }, { ALARM_PRIORITY_MEDIUM, 432, ALM_SRC_FP, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_FP_INLET_TEMPERATURE_OUT_LOW_RANGE }, { ALARM_PRIORITY_MEDIUM, 433, ALM_SRC_FP, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_FP_INLET_TEMPERATURE_OUT_HIGH_RANGE }, { ALARM_PRIORITY_MEDIUM, 434, ALM_SRC_FP, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_FP_INLET_PRESSURE_OUT_LOW_RANGE }, @@ -487,6 +486,7 @@ { ALARM_PRIORITY_HIGH, 110, ALM_SRC_FP, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_RO_INLET_CONDUCTIVITY_HIGH_RANGE }, { ALARM_PRIORITY_HIGH, 110, ALM_SRC_FP, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_REJECTION_RATIO_LOW_RANGE }, { ALARM_PRIORITY_HIGH, 110, ALM_SRC_FP, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE }, + { ALARM_PRIORITY_HIGH, 110, ALM_SRC_FP, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_PERMEATE_FLOW_RATE_BELOW_TARGET }, // Priority Rank Source Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr AutoRes ClrOnly TxLog ID { ALARM_PRIORITY_HIGH, 110, ALM_SRC_FP, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_PERMEATE_FLUSH_CONDUCTIVITY_TIMEOUT }, { ALARM_PRIORITY_HIGH, 110, ALM_SRC_FP, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_CONCENTRATE_FLUSH_TANK_FULL_TIMEOUT }, Index: FPDefs.h =================================================================== diff -u -r74e9720060b86a4fe2d54533003f3961568a9c34 -r44c094762bca5c54881396f9373ae47991a59508 --- FPDefs.h (.../FPDefs.h) (revision 74e9720060b86a4fe2d54533003f3961568a9c34) +++ FPDefs.h (.../FPDefs.h) (revision 44c094762bca5c54881396f9373ae47991a59508) @@ -202,7 +202,6 @@ enum FP_Concentrate_Flush_States { CONC_FLUSH_IN_PROGRESS = 0, ///< Concentrate Flush in progress state - CONC_FLUSH_WAIT_FOR_TANK_FULL, ///< Concentrate Flush wait for tank full state CONC_FLUSH_PAUSED, ///< Concentrate Flush paused state NUM_OF_CONC_FLUSH_STATES ///< Number of Concentrate flush states };