Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r3936f36dc75fc254ba676dd8d55bdfb54f4d2158 -rc053f97a780d6ccaefdb2bad386371e2fafed079
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 3936f36dc75fc254ba676dd8d55bdfb54f4d2158)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision c053f97a780d6ccaefdb2bad386371e2fafed079)
@@ -15,9 +15,6 @@
 *
 ***************************************************************************/
 
-//#include <math.h>
-
-
 #include "Flow.h"
 //#include "NVDataMgmt.h"
 #include "Messaging.h"
@@ -41,14 +38,14 @@
 #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.15F                                                               ///< P term for RO pump flow control.
-#define ROP_FLOW_CONTROL_I_COEFFICIENT              0.65F                                                               ///< I term for RO pump flow control.
+#define ROP_FLOW_CONTROL_P_COEFFICIENT              0.001F                                                              ///< P term for RO pump flow control.
+#define ROP_FLOW_CONTROL_I_COEFFICIENT              0.009F                                                              ///< I term for RO pump flow control.
 #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.
 
-#define ROP_FLOW_TO_PWM_SLOPE                       0.357F                                                              ///< Slope of flow to PWM line equation.
+#define ROP_FLOW_TO_PWM_SLOPE                       0.5F                                                                ///< Slope of flow to PWM line equation.
 #define ROP_FLOW_TO_PWM_INTERCEPT                   0.0F                                                                ///< Intercept of flow to PWM line equation.
-#define ROP_PRESSURE_TO_PWM_SLOPE                   10.0F                                                               ///< Slope of pressure to PWM line equation.
+#define ROP_PRESSURE_TO_PWM_SLOPE                   0.5F                                                               ///< Slope of pressure to PWM line equation.
 #define ROP_PRESSURE_TO_PWM_INTERCEPT               0.0F                                                                ///< Intercept of pressure  to PWM line equation.
 
 #define DATA_PUBLISH_COUNTER_START_COUNT            10                                                                  ///< Data publish counter start count.