Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r7ce76ebd80b818d51dc61fd7f0c0fe94a242d182 -reff31263255b3a3441caff2955b4910f9ccc3656
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 7ce76ebd80b818d51dc61fd7f0c0fe94a242d182)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision eff31263255b3a3441caff2955b4910f9ccc3656)
@@ -67,7 +67,7 @@
 #define FLOW_SAMPLES_TO_AVERAGE                        ( 250 / TASK_PRIORITY_INTERVAL )            ///< Averaging flow data over 250 ms intervals.
 #define FLOW_AVERAGE_MULTIPLIER                        ( 1.0 / (F32)FLOW_SAMPLES_TO_AVERAGE )      ///< Optimization - multiplying is faster than dividing.
 
-#define RO_FLOW_ADC_TO_LPM_FACTOR                      300                                         ///< Conversion factor from ADC counts to LPM (liters/min) for RO flow rate (multiply this by inverse of FPGA reading).
+#define RO_FLOW_ADC_TO_LPM_FACTOR                      300.0                                       ///< Conversion factor from ADC counts to LPM (liters/min) for RO flow rate (multiply this by inverse of FPGA reading).
 
 #define ROP_FLOW_TO_PWM_SLOPE                          0.1                                         ///< Slope of flow to PWM line equation.
 #define ROP_FLOW_TO_PWM_INTERCEPT                      0.0                                         ///< Intercept of flow to PWM line equation.
@@ -140,6 +140,7 @@
 static S32 measuredFlowReadingsSum = 0;                                                            ///< Raw flow reading sums for averaging.
 static U32 flowFilterCounter = 0;                                                                  ///< Flow filtering counter.
 static DG_FLOW_SENSORS_CAL_RECORD_T flowSensorsCalRecord;                                          ///< Flow sensors calibration record.
+static DG_RO_PUMP_CAL_RECORD_T roPumpCalRecord;                                                    ///< RO pump calibration record.
 
 // ********** private function prototypes **********
 
@@ -357,15 +358,14 @@
     {
         F32 flow = RO_FLOW_ADC_TO_LPM_FACTOR / ( (F32)measuredFlowReadingsSum * FLOW_AVERAGE_MULTIPLIER );
 
-            flow = flow - ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) / ML_PER_LITER ) -
-                          ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB ) / ML_PER_LITER );
+        flow = pow(flow, 4) * flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].fourthOrderCoeff +
+               pow(flow, 3) * flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].thirdOrderCoeff  +
+               pow(flow, 2) * flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].secondOrderCoeff +
+                   flow     * flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].gain             +
+                              flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].offset;
 
-        // Apply calibration to flow sensor reading
-        measuredROFlowRateLPM.data = pow(flow, 4) * flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].fourthOrderCoeff +
-                                     pow(flow, 3) * flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].thirdOrderCoeff  +
-                                     pow(flow, 2) * flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].secondOrderCoeff +
-                                         flow     * flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].gain +
-                                                    flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].offset;
+        measuredROFlowRateLPM.data = flow - ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) / ML_PER_LITER ) -
+                                            ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB ) / ML_PER_LITER );
 
         // If the flow is less than a certain value, FPGA will return 0xFFFF meaning that the flow is 0.
         if ( FLOW_SENSOR_ZERO_READING == roFlowReading )
@@ -493,10 +493,14 @@
 SELF_TEST_STATUS_T execROPumpSelfTest( void )
 {
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
+    BOOL calStatus            = FALSE;
 
-    BOOL calStatus = getNVRecord2Driver( GET_CAL_FLOW_SENSORS, (U08*)&flowSensorsCalRecord, sizeof( DG_FLOW_SENSORS_CAL_RECORD_T ),
-                                         NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD );
+    calStatus |= getNVRecord2Driver( GET_CAL_FLOW_SENSORS, (U08*)&flowSensorsCalRecord, sizeof( DG_FLOW_SENSORS_CAL_RECORD_T ),
+                                     NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD );
 
+    calStatus |= getNVRecord2Driver( GET_CAL_RO_PUMP_RECORD, (U08*)&roPumpCalRecord, sizeof( DG_RO_PUMP_CAL_RECORD_T ),
+                                     NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_NO_ALARM );
+
     if ( TRUE == calStatus )
     {
         result = SELF_TEST_STATUS_PASSED;