Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -rebd9aed9d273db8635bc1dd6db189f2a9f591450 -r5738118966dd400f3d985329cf5a521dfe41c703 --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision ebd9aed9d273db8635bc1dd6db189f2a9f591450) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 5738118966dd400f3d985329cf5a521dfe41c703) @@ -7,8 +7,8 @@ * * @file ROPump.c * -* @author (last) Bill Bracken -* @date (last) 25-Aug-2022 +* @author (last) Dara Navaei +* @date (last) 14-Oct-2022 * * @author (original) Sean * @date (original) 04-Apr-2020 @@ -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 @@ -410,16 +410,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; } } @@ -529,7 +529,7 @@ *************************************************************************/ void resetROGenerateVolumeL( void ) { - roVolumeL = 0.0; + roVolumeL = 0.0F; } /*********************************************************************//**