Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -rb576eac158a7bcffd16012dcd5d737e7df4f61d9 -r7b70f5410bf7532b1722be7310e74e998e387cb9 --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision b576eac158a7bcffd16012dcd5d737e7df4f61d9) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 7b70f5410bf7532b1722be7310e74e998e387cb9) @@ -75,7 +75,7 @@ static F32 roPumpDutyCyclePctSet; ///< Currently set RO pump PWM duty cycle. static OVERRIDE_F32_T roPumpOpenLoopTargetDutyCycle; ///< Target RO pump open loop PWM. static BOOL roPumpStartControl; ///< boolean to determine when closed loop flow control starts -static U32 timeSinceStart; ///< Time when RO pump is started from off state. +static U32 timeSinceP12Started; ///< Time when RO pump is started from off state. // ********** private function prototypes ********** @@ -132,7 +132,7 @@ roPumpOpenLoopTargetDutyCycle.ovData = 0.0; roPumpOpenLoopTargetDutyCycle.ovInitData = 0.0; roPumpOpenLoopTargetDutyCycle.override = OVERRIDE_RESET; - timeSinceStart = 0; + timeSinceP12Started = 0; stopROPump(); } @@ -190,7 +190,7 @@ { RO_PUMP_STATE_T state = RO_PUMP_OFF_STATE; isROPumpOn = FALSE; - timeSinceStart = 0; + timeSinceP12Started = 0; // If there is a target flow set, transition to the PI controller and control to flow if ( getTargetROPumpFlowRateMLPM() > 0 ) @@ -225,7 +225,7 @@ if ( state != RO_PUMP_OFF_STATE ) { - timeSinceStart = getMSTimerCount(); + timeSinceP12Started = getMSTimerCount(); } return state; @@ -606,13 +606,13 @@ /*********************************************************************//** * @brief - * The exemptROPumpLowFlowAlarm function gets the flag whether or not + * The isROPumpLowflowAlarmExempt function gets the flag whether or not * to exempt the low flow alarm. * @details \b Inputs: none * @details \b Outputs: none - * @return the flag whether or not to exempt low flow alarm. + * @return TRUE if low flow alarm is exempt, FALSE if not. *************************************************************************/ -BOOL exemptROPumpLowFlowAlarm( void ) +BOOL isROPumpLowflowAlarmExempt( void ) { BOOL result = FALSE; @@ -634,7 +634,7 @@ *************************************************************************/ static U32 getROPumpLowFlowExemptTimer( void ) { - return timeSinceStart; + return timeSinceP12Started; } /*********************************************************************//** Index: firmware/App/Controllers/ROPump.h =================================================================== diff -u -rb576eac158a7bcffd16012dcd5d737e7df4f61d9 -r7b70f5410bf7532b1722be7310e74e998e387cb9 --- firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision b576eac158a7bcffd16012dcd5d737e7df4f61d9) +++ firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision 7b70f5410bf7532b1722be7310e74e998e387cb9) @@ -78,7 +78,7 @@ F32 getTargetROPumpDutyCyclePCT( void ); U32 getTargetROPumpFlowRateMLPM( void ); F32 getTargetROPumpPressure( void ); -BOOL exemptROPumpLowFlowAlarm( void ); +BOOL isROPumpLowflowAlarmExempt( void ); BOOL testROPumpDataPublishIntervalOverride( MESSAGE_T *message ); BOOL testROPumpTargetPressureOverride( MESSAGE_T *message ); Index: firmware/App/Modes/FPModes/StateFlushPermeate.c =================================================================== diff -u -rb576eac158a7bcffd16012dcd5d737e7df4f61d9 -r7b70f5410bf7532b1722be7310e74e998e387cb9 --- firmware/App/Modes/FPModes/StateFlushPermeate.c (.../StateFlushPermeate.c) (revision b576eac158a7bcffd16012dcd5d737e7df4f61d9) +++ firmware/App/Modes/FPModes/StateFlushPermeate.c (.../StateFlushPermeate.c) (revision 7b70f5410bf7532b1722be7310e74e998e387cb9) @@ -174,6 +174,7 @@ checkROInletPressure(); } + // check low flow rate is within range checkPermeateLowFlow(); // check permeate high flow rate is within range Index: firmware/App/Monitors/WaterQualityMonitor.c =================================================================== diff -u -rb576eac158a7bcffd16012dcd5d737e7df4f61d9 -r7b70f5410bf7532b1722be7310e74e998e387cb9 --- firmware/App/Monitors/WaterQualityMonitor.c (.../WaterQualityMonitor.c) (revision b576eac158a7bcffd16012dcd5d737e7df4f61d9) +++ firmware/App/Monitors/WaterQualityMonitor.c (.../WaterQualityMonitor.c) (revision 7b70f5410bf7532b1722be7310e74e998e387cb9) @@ -198,7 +198,7 @@ isFlowOutOfRange = ( ( permeateFlow < minimumAllowedPermeateFlow ) ? TRUE : FALSE ); if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_FP_PERMEATE_FLOW_OUT_LOW_RANGE, isFlowOutOfRange ) ) { - if ( exemptROPumpLowFlowAlarm() != TRUE ) + if ( isROPumpLowflowAlarmExempt() != TRUE ) { SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FP_PERMEATE_FLOW_OUT_LOW_RANGE, permeateFlow, minimumAllowedPermeateFlow ); }