Index: firmware/App/Modes/ModeDrain.c =================================================================== diff -u -rdc0d9b087c609e71cacdb7f0395cccf29d749c00 -rcc398b14ccf518f350b57fb5cb8728e5c908bd1e --- firmware/App/Modes/ModeDrain.c (.../ModeDrain.c) (revision dc0d9b087c609e71cacdb7f0395cccf29d749c00) +++ firmware/App/Modes/ModeDrain.c (.../ModeDrain.c) (revision cc398b14ccf518f350b57fb5cb8728e5c908bd1e) @@ -22,8 +22,8 @@ #include "OperationModes.h" #include "Pressures.h" #include "Reservoirs.h" -#include "Valves.h" #include "TemperatureSensors.h" +#include "Valves.h" /** * @addtogroup DGDrainMode @@ -44,10 +44,10 @@ /*********************************************************************//** * @brief - * The initOpParamsMode function initializes the Drain Mode module. + * The initDrainMode function initializes the drain mode module. * @details * Inputs : none - * Outputs : Operating Parameters Mode module initialized. + * Outputs : drainState * @return none *************************************************************************/ void initDrainMode( void ) @@ -57,11 +57,10 @@ /*********************************************************************//** * @brief - * The transitionToDrainMode function prepares for transition to drain \n - * mode. + * The transitionToDrainMode function prepares for transition to drain mode. * @details * Inputs : none - * Outputs : + * Outputs : Drain mode initialized * @return none *************************************************************************/ void transitionToDrainMode( void ) @@ -76,18 +75,19 @@ /*********************************************************************//** * @brief - * The execDrainMode function executes the Drain Mode state machine. + * The execDrainMode function executes the drain mode state machine. * @details - * Inputs : none - * Outputs : + * Inputs : drainState + * Outputs : Check water quality, drain mode state machine executed * @return current state. *************************************************************************/ U32 execDrainMode( void ) { - // check inlet water conductivity, temperature, and pressure - checkInletWaterConductivity( drainState ); + // check inlet water conductivity, temperature, pressure, and RO rejection ratio + checkInletWaterConductivity(); checkInletWaterTemperature(); checkInletPressure(); + checkRORejectionRatio(); // execute current drain state switch ( drainState ) @@ -111,11 +111,10 @@ /*********************************************************************//** * @brief - * The handleDrainState function handles the drain state of the Drain Mode \n - * state machine. + * The handleDrainState function handles the drain state of the drain mode state machine. * @details * Inputs : none - * Outputs : + * Outputs : Drain out from reservoir * @return the next state *************************************************************************/ static DG_DRAIN_STATE_T handleDrainState( void ) @@ -141,8 +140,7 @@ /*********************************************************************//** * @brief - * The getCurrentDrainState function returns the current state of the \n - * drain mode. + * The getCurrentDrainState function returns the current state of the drain mode. * @details * Inputs : drainState * Outputs : none