Index: firmware/App/Modes/FPModes/FlushPermeate.c =================================================================== diff -u -r830213bc6dcc1a684610caf78c79d55f2cb41e93 -r47a7b0fce13cf38919932a8662c378f4f6a8b9f3 --- firmware/App/Modes/FPModes/FlushPermeate.c (.../FlushPermeate.c) (revision 830213bc6dcc1a684610caf78c79d55f2cb41e93) +++ firmware/App/Modes/FPModes/FlushPermeate.c (.../FlushPermeate.c) (revision 47a7b0fce13cf38919932a8662c378f4f6a8b9f3) @@ -8,7 +8,7 @@ * @file FlushPermeate.c * * @author (last) “rkallala” -* @date (last) 09-Dec-2025 +* @date (last) 15-Jan-2026 * * @author (original) Michael Garthwaite * @date (original) 08-Sep-2025 @@ -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,11 +170,24 @@ setBoostPumpTargetPressure( PERMEATE_FLUSH_BOOST_PUMP_TGT_PSI ); isTankFilled = FALSE; } + + checkROInletPressure(); } if ( TRUE == didTimeout( permeateFlushTimer, getPermeateFlushTimeout() ) ) { F32 p18conductivity = getFilteredConductivity( P18_COND ); + // 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; @@ -248,6 +257,7 @@ { setBoostPumpTargetPressure( PERMEATE_FLUSH_BOOST_PUMP_TGT_PSI ); } + //TODO update target macro after changing it to 750 + rinse pump rate setROPumpTargetFlowRateMLPM( PERMEATE_FLUSH_RO_PUMP_TGT_ML, TRUE ); permeateFlushTimer = getMSTimerCount(); permeateFlushAlarmTimer = getMSTimerCount();