Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -r8550fa4d9700f4ce2da48c3ed1d67113e787addf -recb538c8bf67a7a62d11a1186a9ef5fe53cf9d9e --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 8550fa4d9700f4ce2da48c3ed1d67113e787addf) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision ecb538c8bf67a7a62d11a1186a9ef5fe53cf9d9e) @@ -250,7 +250,7 @@ { roPumpDutyCyclePctSet = roPumpFlowToPWM( getTargetROPumpFlowRateMLPM() ); } - resetPIController( PI_CONTROLLER_ID_RO_PUMP_FLOW, roPumpDutyCyclePctSet, 0.0F); + resetPIController( PI_CONTROLLER_ID_RO_PUMP_FLOW, roPumpDutyCyclePctSet, 0.0F ); state = RO_PUMP_CONTROL_TO_TARGET_FLOW_STATE; } // If there is a target pressure set, transition to the PI controller and control to pressure. @@ -594,7 +594,7 @@ * The roPumpPresToPWM function calculates the duty cycle for the given target * pressure. * @details \b Inputs: none - * @details \b Outputs: dutyCyclePct + * @details \b Outputs: none * @param targetPressure target pressure value to control in PSI * @return the current target RO pump PWM in a percentage. *************************************************************************/ @@ -610,7 +610,7 @@ * The roPumpFlowToPWM function calculates the duty cycle for the given target * flow rate. * @details \b Inputs: none - * @details \b Outputs: dutyCyclePct + * @details \b Outputs: none * @param targetFlow target flow value to control in in mL/min * @return the current target RO pump PWM in a percentage. *************************************************************************/ @@ -623,10 +623,11 @@ /*********************************************************************//** * @brief - * The signalROPumpStop function stops the P12 pump immediately and + * The signalROPumpHardStop function stops the P12 pump immediately and * resets all the variables associated with the P12 pump run. - * @details \b Inputs: roPumpState[] - * @details \b Outputs: stopPumpRequest[] + * @details \b Inputs: targetROPumpFlowRate, targetROPumpPressure + * @details \b Outputs: roPumpState, roPumpDutyCyclePctSet, roControlTimerCounter, + * roPumpOpenLoopTargetDutyCycle, targetROPumpFlowRate, targetROPumpPressure * @return none *************************************************************************/ void signalROPumpHardStop( void ) @@ -735,8 +736,10 @@ * @brief * The testROPumpTargetPressureOverride function overrides the RO pump * data publish interval. - * @details \b Inputs: targetROPumpPressure - * @details \b Outputs: targetROPumpPressure + * @details \b Inputs: targetROPumpPressure, targetROPumpFlowRate, + * roPumpOpenLoopTargetDutyCycle + * @details \b Outputs: targetROPumpPressure, targetROPumpFlowRate, + * roPumpOpenLoopTargetDutyCycle * @param message Override message from Dialin which includes the value * of the target pressure * @return TRUE if override successful, FALSE if not @@ -784,8 +787,10 @@ * @brief * The testROPumpTargetFlowOverride function overrides the RO pump * data publish interval. - * @details \b Inputs: targetROPumpFlowRate - * @details \b Outputs: targetROPumpFlowRate + * @details \b Inputs: targetROPumpFlowRate, roPumpOpenLoopTargetDutyCycle, + * targetROPumpPressure + * @details \b Outputs: targetROPumpFlowRate, roPumpOpenLoopTargetDutyCycle, + * targetROPumpPressure * @param message Override message from Dialin which includes the value * of the target flow * @return TRUE if override successful, FALSE if not @@ -833,8 +838,10 @@ * @brief * The testROPumpTargetDutyCycleOverride function overrides the RO pump * duty cycle. - * @details \b Inputs: roPumpOpenLoopTargetDutyCycle - * @details \b Outputs: roPumpOpenLoopTargetDutyCycle + * @details \b Inputs: roPumpOpenLoopTargetDutyCycle, targetROPumpPressure, + * targetROPumpFlowRate + * @details \b Outputs: roPumpOpenLoopTargetDutyCycle, targetROPumpPressure, + * targetROPumpFlowRate * @param message Override message from Dialin which includes the value * of the target flow * @return TRUE if override successful, FALSE if not @@ -881,8 +888,8 @@ /*********************************************************************//** * @brief * The testBoostPumpHardStopOverride function stops the RO pump. - * @details \b Inputs: boostPumpOpenLoopTargetDutyCycle - * @details \b Outputs: boostPumpOpenLoopTargetDutyCycle + * @details \b Inputs: roPumpOpenLoopTargetDutyCycle + * @details \b Outputs: roPumpOpenLoopTargetDutyCycle * @param message Override message from Dialin which includes the value * of the target flow * @return TRUE if override successful, FALSE if not