Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -r45fe3b732b4fb769f7788bef699a8dd34b250425 -rf192234d80556802fa42e62f8c1b20d1474f82f1 --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 45fe3b732b4fb769f7788bef699a8dd34b250425) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision f192234d80556802fa42e62f8c1b20d1474f82f1) @@ -228,7 +228,7 @@ roPumpPWMDutyCyclePct = ROP_FLOW_TO_PWM_DC( roFlowRate ); roControlTimerCounter = 0; isROPumpOn = TRUE; - result = TRUE; + result = TRUE; } // Requested max pressure is out of range else @@ -269,9 +269,9 @@ if ( ( maxPressure >= MIN_ALLOWED_PRESSURE_PSI ) && ( maxPressure <= MAX_ALLOWED_PRESSURE_PSI ) ) { pendingROPumpCmdMaxPressure = (F32)maxPressure; - pendingROPumpCmdTargetFlow = roFlowRate; - pendingROPumpCmdCountDown = delayMs / TASK_GENERAL_INTERVAL; - result = TRUE; + pendingROPumpCmdTargetFlow = roFlowRate; + pendingROPumpCmdCountDown = delayMs / TASK_GENERAL_INTERVAL; + result = TRUE; } // Requested max pressure is out of range else @@ -405,16 +405,16 @@ pendingROPumpCmdCountDown--; if ( 0 == pendingROPumpCmdCountDown ) { - targetROPumpMaxPressure = pendingROPumpCmdMaxPressure; - targetROPumpFlowRateLPM = pendingROPumpCmdTargetFlow; - pendingROPumpCmdMaxPressure = 0.0; - pendingROPumpCmdTargetFlow = 0.0; - roPumpControlMode = PUMP_CONTROL_MODE_CLOSED_LOOP; - roPumpState = RO_PUMP_RAMP_UP_TO_TARGET_FLOW_STATE; + targetROPumpMaxPressure = pendingROPumpCmdMaxPressure; + targetROPumpFlowRateLPM = pendingROPumpCmdTargetFlow; + pendingROPumpCmdMaxPressure = 0.0F; + pendingROPumpCmdTargetFlow = 0.0F; + roPumpControlMode = PUMP_CONTROL_MODE_CLOSED_LOOP; + roPumpState = RO_PUMP_RAMP_UP_TO_TARGET_FLOW_STATE; // Get the initial guess of the duty cycle - roPumpPWMDutyCyclePct = ROP_FLOW_TO_PWM_DC( targetROPumpFlowRateLPM ); - roControlTimerCounter = 0; - isROPumpOn = TRUE; + roPumpPWMDutyCyclePct = ROP_FLOW_TO_PWM_DC( targetROPumpFlowRateLPM ); + roControlTimerCounter = 0; + isROPumpOn = TRUE; } } @@ -508,7 +508,7 @@ *************************************************************************/ void resetROGenerateVolumeL( void ) { - roVolumeL = 0.0; + roVolumeL = 0.0F; } /*********************************************************************//**