Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r04f1fe65f5a31f8521d914a0a5ec89a048f4a30e -rcc21792bbb6684f7519d8cc4eeb1f163d4a99a8f
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 04f1fe65f5a31f8521d914a0a5ec89a048f4a30e)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision cc21792bbb6684f7519d8cc4eeb1f163d4a99a8f)
@@ -398,7 +398,7 @@
     {
         // The feedback voltage is on the 0V line so when the duty cycle is 0, the feedback is 2.5V
         // The duty cycle is calculated by getting the 1 - (ratio of feedback / to the voltage at 0 percent duty cycle).
-        roPumpFeedbackDutyCyclePct =  1.0 - ( roFeedbackVoltage / ROP_FEEDBACK_0_PCT_DUTY_CYCLE_VOLTAGE );
+        roPumpFeedbackDutyCyclePct =  1.0F - ( roFeedbackVoltage / ROP_FEEDBACK_0_PCT_DUTY_CYCLE_VOLTAGE );
 
         // To monitor the flow, the control mode must be in closed loop mode and the pump should be control to flow state
         // If the pump is controlled to the maximum pressure, the flow might be different from the target flow for more than 10%
@@ -662,7 +662,7 @@
     // Get the current pressure from the sensor
     F32 actualPressure    = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_OUTLET );
     F32 targetFlowRate    = getTargetROPumpFlowRateLPM();
-    F32 actualFlowRate    = getMeasuredFlowRateLPM( RO_FLOW_SENSOR ); //(F32)getMeasuredROFlowRateLPM();
+    F32 actualFlowRate    = getMeasuredFlowRateLPM( RO_FLOW_SENSOR );
     F32 flowRateDeviation = fabs( targetFlowRate - actualFlowRate ) / targetFlowRate;
     BOOL isFlowOutOfRange = flowRateDeviation > ROP_FLOW_TARGET_TOLERANCE;
     F32 targetPressure    = getTargetROPumpPressure();
@@ -726,7 +726,7 @@
         }
         else
         {
-            roPumpDutyCyclePctSet = runPIController( PI_CONTROLLER_ID_RO_PUMP_FLOW, getTargetROPumpFlowRateLPM(), getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) /*getMeasuredROFlowRateLPM()*/ );
+            roPumpDutyCyclePctSet = runPIController( PI_CONTROLLER_ID_RO_PUMP_FLOW, getTargetROPumpFlowRateLPM(), getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) );
         }
 
         setROPumpControlSignalDutyCycle( roPumpDutyCyclePctSet );
@@ -762,7 +762,7 @@
         }
         else
         {
-            roPumpDutyCyclePctSet = runPIController( PI_CONTROLLER_ID_RO_PUMP_MAX_PRES, getTargetROPumpFlowRateLPM(), getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) /*getMeasuredROFlowRateLPM()*/ );
+            roPumpDutyCyclePctSet = runPIController( PI_CONTROLLER_ID_RO_PUMP_MAX_PRES, getTargetROPumpFlowRateLPM(), getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) );
         }
 
         setROPumpControlSignalDutyCycle( roPumpDutyCyclePctSet );