Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -r17a448770daa138ebeb6ce79974966e650828f25 -rc71fc505053e922b9865f1e241d01e144d8d68cd --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 17a448770daa138ebeb6ce79974966e650828f25) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision c71fc505053e922b9865f1e241d01e144d8d68cd) @@ -83,6 +83,7 @@ static OVERRIDE_F32_T targetROPumpPressure; ///< Target RO max allowed pressure (in PSI). static F32 roPumpDutyCyclePctSet; ///< Currently set RO pump PWM duty cycle. static F32 roPumpOpenLoopTargetDutyCycle; ///< Target RO pump open loop PWM. + // ********** private function prototypes ********** static RO_PUMP_STATE_T handleROPumpOffState( void ); @@ -123,20 +124,20 @@ isROPumpOn = FALSE; stopPumpRequest = FALSE; roControlTimerCounter = 0; - roPumpDutyCyclePctSet = 0; - roPumpOpenLoopTargetDutyCycle = 0; + roPumpDutyCyclePctSet = 0.0; + roPumpOpenLoopTargetDutyCycle = 0.0; roPumpDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT; roPumpDataPublishInterval.data = RO_PUMP_DATA_PUB_INTERVAL; roPumpDataPublishInterval.ovData = RO_PUMP_DATA_PUB_INTERVAL; roPumpDataPublishInterval.ovInitData = 0; roPumpDataPublishInterval.override = OVERRIDE_RESET; - targetROPumpFlowRate.data = 0; - targetROPumpFlowRate.ovData = 0; - targetROPumpFlowRate.ovInitData = 0; + targetROPumpFlowRate.data = 0.0; + targetROPumpFlowRate.ovData = 0.0; + targetROPumpFlowRate.ovInitData = 0.0; targetROPumpFlowRate.override = OVERRIDE_RESET; - targetROPumpPressure.data = 0; - targetROPumpPressure.ovData = 0; - targetROPumpPressure.ovInitData = 0; + targetROPumpPressure.data = 0.0; + targetROPumpPressure.ovData = 0.0; + targetROPumpPressure.ovInitData = 0.0; targetROPumpPressure.override = OVERRIDE_RESET; stopROPump(); @@ -283,7 +284,6 @@ roPumpDutyCyclePctSet = runPIController( PI_CONTROLLER_ID_RO_PUMP_FLOW, getTargetROPumpFlowRateLPM(), getFlowRate( P16_FLOW ) ); setFluidPumpPctToPWMDutyCycle( P12_PUMP, roPumpDutyCyclePctSet ); roControlTimerCounter = 0; - } return state; @@ -307,7 +307,6 @@ roPumpDutyCyclePctSet = runPIController( PI_CONTROLLER_ID_RO_PUMP_PRES, getTargetROPumpPressure(), getFilteredPressure( P17_PRES ) ); setFluidPumpPctToPWMDutyCycle( P12_PUMP, roPumpDutyCyclePctSet ); roControlTimerCounter = 0; - } return state; @@ -644,5 +643,4 @@ return result; } - /**@}*/