Index: firmware/App/Modes/FlushPermeate.c =================================================================== diff -u -rf79d3737907fd08293d56f60f9f439ac68c81855 -r6dd382e3988fac2f9ee041b4738d67305e17a6a2 --- firmware/App/Modes/FlushPermeate.c (.../FlushPermeate.c) (revision f79d3737907fd08293d56f60f9f439ac68c81855) +++ firmware/App/Modes/FlushPermeate.c (.../FlushPermeate.c) (revision 6dd382e3988fac2f9ee041b4738d67305e17a6a2) @@ -21,6 +21,7 @@ #include "FPOperationModes.h" #include "MessageSupport.h" #include "Messaging.h" +#include "PermeateTank.h" #include "Pressure.h" #include "ROPump.h" #include "TaskGeneral.h" @@ -38,7 +39,7 @@ #define PERMEATE_FLUSH_DATA_PUBLISH_INTERVAL ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the gen water mode data published. #define PERMEATE_FLUSH_TIMEOUT ( 30 * MS_PER_SECOND ) ///< Permeate flush timer (in ms) #define PERMEATE_FLUSH_ALARM_TIMEOUT ( 120 * MS_PER_SECOND ) ///< Permeate flush timer (in ms) -#define PERMEATE_FLUSH_RO_PUMP_TGT_PSI 15 ///< Pressure target in PSI for the RO pump during permeate flush. +#define PERMEATE_FLUSH_RO_PUMP_TGT_ML 700 ///< Pressure target in ml/min for the RO pump during permeate flush. #define PERMEATE_FLUSH_BOOST_PUMP_TGT_PSI 25 ///< Pressure target in PSI for the boost pump during permeate flush. #define PERMEATE_FLUSH_CONDUCTIVITY_THRESHOLD 200.0F ///< Conductivity alarm threshold for permeate flush. @@ -141,10 +142,10 @@ { FP_PERM_FLUSH_STATE_T state = PERM_FLUSH_IN_PROGRESS; - if ( TRUE == 1 )// Alarm Change - { - state = PERM_FLUSH_PAUSED; - } +// if ( TRUE == 1 ))// TODO Alarm and Stop State Rework +// { +// state = PERM_FLUSH_PAUSED; +// } if( TRUE == didTimeout( permeateFlushTimer, getPermeateFlushTimeout() ) ) { @@ -213,12 +214,12 @@ setValveState( P39_VALV, VALVE_STATE_OPEN ); setValveState( P20_VALV, VALVE_STATE_CLOSED ); setValveState( P43_VALV, VALVE_STATE_CLOSED ); - + startPermeateTankControl(); if ( TRUE == isBoostPumpInstalled() ) { setBoostPumpTargetPressure( PERMEATE_FLUSH_BOOST_PUMP_TGT_PSI ); } - setROPumpTargetPressure( PERMEATE_FLUSH_RO_PUMP_TGT_PSI ); + setROPumpTargetPressure( PERMEATE_FLUSH_RO_PUMP_TGT_ML ); permeateFlushTimer = getMSTimerCount(); permeateFlushAlarmTimer = getMSTimerCount(); pendingStartPermeateFlushRequest = FALSE;