Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -ra0c144ed9f72066d7a7b1d047b01fb76ca56d667 -r43161808ceba270f92822369359aa299c647c9fe
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision a0c144ed9f72066d7a7b1d047b01fb76ca56d667)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 43161808ceba270f92822369359aa299c647c9fe)
@@ -39,8 +39,8 @@
 #define RO_PUMP_DATA_PUB_INTERVAL                   ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )                           ///< Interval (ms/task time) at which the RO Pump data is published on the CAN bus.
 #define ROP_CONTROL_INTERVAL                        ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )                           ///< Interval (ms/task time) at which the RO pump is controlled.
 
-#define ROP_FLOW_CONTROL_P_COEFFICIENT              0.1F                                                                ///< P term for RO pump flow control.
-#define ROP_FLOW_CONTROL_I_COEFFICIENT              0.8F                                                                ///< I term for RO pump flow control.
+#define ROP_FLOW_CONTROL_P_COEFFICIENT              0.000065F                                                           ///< P term for RO pump flow control.
+#define ROP_FLOW_CONTROL_I_COEFFICIENT              0.00022F                                                            ///< I term for RO pump flow control.
 #define ROP_MIN_FLOW_TO_CONTROL_PCT                 0.75F
 #define ROP_PRESSURE_CONTROL_P_COEFFICIENT          0.15F                                                               ///< P term for RO pump pressure control.
 #define ROP_PRESSURE_CONTROL_I_COEFFICIENT          0.65F                                                               ///< I term for RO pump pressure control.
@@ -123,9 +123,9 @@
     targetROPumpPressure.ovData                 = 0.0F;
     targetROPumpPressure.ovInitData             = 0.0F;
     targetROPumpPressure.override               = OVERRIDE_RESET;
-    roPumpOpenLoopTargetDutyCycle.data          = 0;
-    roPumpOpenLoopTargetDutyCycle.ovData        = 0;
-    roPumpOpenLoopTargetDutyCycle.ovInitData    = 0;
+    roPumpOpenLoopTargetDutyCycle.data          = 0.0;
+    roPumpOpenLoopTargetDutyCycle.ovData        = 0.0;
+    roPumpOpenLoopTargetDutyCycle.ovInitData    = 0.0;
     roPumpOpenLoopTargetDutyCycle.override      = OVERRIDE_RESET;
 
     stopROPump();
@@ -296,11 +296,10 @@
         // P16 flow seems to lag in current Leahi HW. We will wait till we hit a % of target flow before we start changing control.
         if( ( TRUE == roPumpStartControl ) || ( getFilteredFlow( P16_FLOW ) >= ( (F32)getTargetROPumpFlowRateMLPM() * ROP_MIN_FLOW_TO_CONTROL_PCT ) ) )
         {
-            //roPumpDutyCyclePctSet = runPIController( PI_CONTROLLER_ID_RO_PUMP_FLOW, (F32)getTargetROPumpFlowRateMLPM(), getFilteredFlow( P16_FLOW ) );
-            //setFluidPumpPctToPWMDutyCycle( P12_PUMP, roPumpDutyCyclePctSet );
-            nexttgtflow = runPIController( PI_CONTROLLER_ID_RO_PUMP_FLOW, (F32)getTargetROPumpFlowRateMLPM(), getFilteredFlow( P16_FLOW ) );
-            nexttgtflow = (U16)MIN( ROP_FLOW_TO_PWM( nexttgtflow ), ( MAX_FLUID_PUMP_PWM_DUTY_CYCLE * MAX_FLUID_PUMP_DUTY_CYCLE_PCT ) );
-            setFluidPumpPWMDutyCycle( P12_PUMP, nexttgtflow );
+            roPumpDutyCyclePctSet = runPIController( PI_CONTROLLER_ID_RO_PUMP_FLOW, (F32)getTargetROPumpFlowRateMLPM(), getFilteredFlow( P16_FLOW ) );
+            roPumpDutyCyclePctSet = MIN( roPumpDutyCyclePctSet, ( MAX_FLUID_PUMP_PWM_DUTY_CYCLE * MAX_FLUID_PUMP_DUTY_CYCLE_PCT ) );
+            setFluidPumpPctToPWMDutyCycle( P12_PUMP, roPumpDutyCyclePctSet );
+
             if ( FALSE == roPumpStartControl )
             {
                 roPumpStartControl = TRUE;