Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -r2e21405574597474db0ebae86cdd7fa2d517f71c -re6c4c61c793a91f9ed9dfe969e01bdeee565347d --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision e6c4c61c793a91f9ed9dfe969e01bdeee565347d) @@ -303,15 +303,15 @@ void signalROPumpHardStop( void ) { stopROPump(); - targetROPumpFlowRateLPM = 0; + targetROPumpFlowRateLPM = 0.0F; roPumpState = RO_PUMP_OFF_STATE; - roPumpPWMDutyCyclePct = 0.0; - roPumpOpenLoopTargetDutyCycle = 0.0; + roPumpPWMDutyCyclePct = 0.0F; + roPumpOpenLoopTargetDutyCycle = 0.0F; roControlTimerCounter = 0; isROPumpOn = FALSE; targetROPumpMaxPressure = 0; - pendingROPumpCmdMaxPressure = 0.0; - pendingROPumpCmdTargetFlow = 0.0; + pendingROPumpCmdMaxPressure = 0.0F; + pendingROPumpCmdTargetFlow = 0.0F; pendingROPumpCmdCountDown = 0; resetPIController( PI_CONTROLLER_ID_RO_PUMP_FLOW, MIN_RO_PUMP_DUTY_CYCLE ); } @@ -492,13 +492,13 @@ /*********************************************************************//** * @brief - * The getTargetROPumpPressure function gets the current target RO pump + * The getTargetROPumpPressurePSI function gets the current target RO pump * pressure. - * @details Inputs: targetROPumpPressure - * @details Outputs: targetROPumpPressure - * @return the current target RO targetROPumpPressure in psi. + * @details Inputs: none + * @details Outputs: targetROPumpMaxPressure + * @return the current target RO pump pressure in psi. *************************************************************************/ -F32 getTargetROPumpPressure( void ) +F32 getTargetROPumpPressurePSI( void ) { return targetROPumpMaxPressure; } @@ -581,7 +581,7 @@ F32 actualFlowRate = getMeasuredFlowRateLPM( RO_FLOW_SENSOR ); F32 flowRateDeviation = fabs( targetFlowRate - actualFlowRate ) / targetFlowRate; BOOL isFlowOutOfRange = flowRateDeviation > ROP_FLOW_TARGET_TOLERANCE; - F32 targetPressure = getTargetROPumpPressure(); + F32 targetPressure = getTargetROPumpPressurePSI(); if ( ++roControlTimerCounter >= ROP_RAMP_UP_CONTROL_INTERVAL ) { @@ -777,7 +777,7 @@ RO_PUMP_DATA_T pumpData; pumpData.roPumpTgtFlowRateLM = getTargetROPumpFlowRateLPM(); - pumpData.roPumpTgtPressure = getTargetROPumpPressure(); + pumpData.roPumpTgtPressure = getTargetROPumpPressurePSI(); pumpData.roPumpDutyCycle = roPumpDutyCyclePctSet * FRACTION_TO_PERCENT_FACTOR; pumpData.roPumpState = (U32)roPumpState; pumpData.roPumpFBDutyCycle = roPumpFeedbackDutyCyclePct * FRACTION_TO_PERCENT_FACTOR;