Index: firmware/App/Modes/ModeRecirculate.c =================================================================== diff -u -rdc0d9b087c609e71cacdb7f0395cccf29d749c00 -rcc398b14ccf518f350b57fb5cb8728e5c908bd1e --- firmware/App/Modes/ModeRecirculate.c (.../ModeRecirculate.c) (revision dc0d9b087c609e71cacdb7f0395cccf29d749c00) +++ firmware/App/Modes/ModeRecirculate.c (.../ModeRecirculate.c) (revision cc398b14ccf518f350b57fb5cb8728e5c908bd1e) @@ -27,9 +27,9 @@ #include "Pressures.h" #include "ROPump.h" #include "TaskGeneral.h" +#include "TemperatureSensors.h" #include "Timers.h" #include "Valves.h" -#include "TemperatureSensors.h" /** * @addtogroup DGRecirculateMode @@ -54,10 +54,10 @@ /*********************************************************************//** * @brief - * The initRecirculateMode function initializes the Fill Mode module. + * The initRecirculateMode function initializes the re-circulate mode module. * @details * Inputs : none - * Outputs : Fill Mode module initialized. + * Outputs : Re-circulate mode module initialized * @return none *************************************************************************/ void initRecirculateMode( void ) @@ -68,11 +68,10 @@ /*********************************************************************//** * @brief - * The transitionToRecirculateMode function prepares for transition to \n - * fill mode. + * The transitionToRecirculateMode function prepares for transition to re-circulate mode. * @details * Inputs : none - * Outputs : recircState + * Outputs : Re-initialized re-circulate mode * @return none *************************************************************************/ void transitionToRecirculateMode( void ) @@ -102,18 +101,19 @@ /*********************************************************************//** * @brief - * The execRecirculateMode function executes the Re-circulate Mode state machine. + * The execRecirculateMode function executes the re-circulate mode state machine. * @details * Inputs : recircState - * Outputs : recircState + * Outputs : Check water quality, re-circulate mode state machine executed * @return current state *************************************************************************/ U32 execRecirculateMode( void ) { - // check inlet water conductivity, temperature, and pressure - checkInletWaterConductivity( recircState ); + // check inlet water conductivity, temperature, pressure, and RO rejection ratio + checkInletWaterConductivity(); checkInletWaterTemperature(); checkInletPressure(); + checkRORejectionRatio(); // execute current re-circulate state switch ( recircState ) @@ -145,11 +145,11 @@ /*********************************************************************//** * @brief - * The handleCheckInletWaterState function executes the flush lines \n - * state of the Re-circulate Mode state machine. + * The handleFlushLinesState function executes the flush lines state of the + * re-circulate mode state machine. * @details * Inputs : none - * Outputs : + * Outputs : Integrate volume of water moved through line * @return the next state *************************************************************************/ static DG_RECIRCULATE_MODE_STATE_T handleFlushLinesState( void ) @@ -173,11 +173,11 @@ /*********************************************************************//** * @brief - * The handleRecircProductWaterState function executes the re-circulate \n - * water state of the Re-circulate Mode state machine. + * The handleRecircWaterState function executes the re-circulate water state + * of the re-circulate mode state machine. * @details * Inputs : none - * Outputs : + * Outputs : none * @return the next state *************************************************************************/ static DG_RECIRCULATE_MODE_STATE_T handleRecircWaterState( void ) @@ -189,11 +189,11 @@ /*********************************************************************//** * @brief - * The handleRecircPauseState function executes the pause state of the \n - * Re-circulate Mode state machine. + * The handleRecircPauseState function executes the pause state of the + * re-circulate mode state machine. * @details * Inputs : none - * Outputs : + * Outputs : none * @return the next state *************************************************************************/ static DG_RECIRCULATE_MODE_STATE_T handleRecircPauseState( void ) @@ -205,7 +205,7 @@ /*********************************************************************//** * @brief - * The requestDGStop function handles an HD request to stop (return to Standby mode). + * The requestDGStop function handles an HD request to stop (return to standby mode). * @details * Inputs : none * Outputs : DG standby mode requested @@ -222,12 +222,12 @@ /*********************************************************************//** * @brief - * The getCurrentRecirculateState function returns the current state of the \n + * The getCurrentRecirculateState function returns the current state of the * re-circulate mode. * @details * Inputs : recircState * Outputs : none - * @return the current state of re-circulate mode. + * @return the current state of re-circulate mode *************************************************************************/ DG_RECIRCULATE_MODE_STATE_T getCurrentRecirculateState( void ) {