Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -r3f5c0e277e979078c3153421274c660258e8a68b -ra80e7b6bee41fed2e5246332c577c5a29de1d8dc --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 3f5c0e277e979078c3153421274c660258e8a68b) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision a80e7b6bee41fed2e5246332c577c5a29de1d8dc) @@ -107,7 +107,6 @@ { initFluidPump(); - // Initialize RO pump PI controller to flow initializePIController( PI_CONTROLLER_ID_RO_PUMP_FLOW, MIN_FLUID_PUMP_DUTY_CYCLE_PCT, ROP_FLOW_CONTROL_P_COEFFICIENT, ROP_FLOW_CONTROL_I_COEFFICIENT, MIN_FLUID_PUMP_DUTY_CYCLE_PCT, MAX_FLUID_PUMP_DUTY_CYCLE_PCT, FALSE, 0 ); @@ -150,7 +149,6 @@ *************************************************************************/ void execROPumpController( void ) { - // Update RO pump feedback from FPGA readFluidPumps(); @@ -223,6 +221,7 @@ isROPumpOn = TRUE; state = RO_PUMP_OPEN_LOOP_STATE; } + return state; } @@ -242,7 +241,7 @@ if ( TRUE == stopPumpRequest ) { stopPumpRequest = FALSE; - state = RO_PUMP_OFF_STATE; + state = RO_PUMP_OFF_STATE; } // If there is a target pressure set, transition to the PI controller and control to pressure. if ( ( getTargetROPumpPressure() > 0.0F ) && ( PUMP_CONTROL_MODE_CLOSED_LOOP == roPumpControlMode ) ) @@ -288,7 +287,7 @@ /*********************************************************************//** * @brief - * The handleROPumpControlToMaxPressureState function handles the control + * The handleROPumpControlToTargetPressureState function handles the control * to target pressure state of the RO pump controller state machine. * @details Inputs: roPumpPWMDutyCyclePctSet, roControlTimerCounter, roPumpControlMode * @details Outputs: roPumpPWMDutyCyclePctSet, roControlTimerCounter @@ -311,7 +310,7 @@ /*********************************************************************//** * @brief - * The setROPumpTargetFlowRate function sets a new target flow rate for the + * The setROPumpTargetFlowRateLPM function sets a new target flow rate for the * RO pump. * @details Inputs: roPumpOpenLoopTargetDutyCycle * @details Outputs: targetROPumpFlowRate, roPumpControlMode, roPumpDutyCyclePctSet, @@ -509,16 +508,15 @@ *************************************************************************/ void signalROPumpHardStop( void ) { - if( targetROPumpFlowRate.data > 0.0F ) { - targetROPumpFlowRate.data = 0.0F;; + targetROPumpFlowRate.data = 0.0F; resetPIController( PI_CONTROLLER_ID_RO_PUMP_FLOW, MIN_FLUID_PUMP_DUTY_CYCLE_PCT, 0.0F ); } if( targetROPumpPressure.data > 0.0F ) { - targetROPumpPressure.data = 0.0F;; + targetROPumpPressure.data = 0.0F; resetPIController( PI_CONTROLLER_ID_RO_PUMP_PRES, MIN_FLUID_PUMP_DUTY_CYCLE_PCT, 0.0F ); }