Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -rbb8d23755bc6f2d3016bde413fbdd32d31fa9838 -r3e9328290bdbc18a940935bd7f7c720ca8432b1d
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision bb8d23755bc6f2d3016bde413fbdd32d31fa9838)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 3e9328290bdbc18a940935bd7f7c720ca8432b1d)
@@ -68,8 +68,11 @@
 #define FLOW_SAMPLES_TO_AVERAGE                        ( 250 / TASK_PRIORITY_INTERVAL )            ///< Averaging flow data over 250 ms intervals.
 #define FLOW_AVERAGE_MULTIPLIER                        ( 1.0F / (F32)FLOW_SAMPLES_TO_AVERAGE )     ///< Optimization - multiplying is faster than dividing.
 
-#define RO_FLOW_ADC_TO_LPM_FACTOR                      300.0F                                      ///< Conversion factor from ADC counts to LPM (liters/min) for RO flow rate (multiply this by inverse of FPGA reading).
-
+// The ADC to LPM factor is calculated using the following steps:
+// 0.1 to 2 LPM range
+// 110000 pulses/liter
+// For 2 LPM => 2LPM x 110000 pulses/liter * 1 edges/pulse * 1 min/60 seconds
+#define RO_FLOW_ADC_TO_LPM_FACTOR                      272.72F                                     ///< 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.1F                                        ///< Slope of flow to PWM line equation.
 #define ROP_FLOW_TO_PWM_INTERCEPT                      0.0F                                        ///< Intercept of flow to PWM line equation.
 
@@ -354,7 +357,7 @@
     if ( TRUE == isNewCalibrationRecordAvailable() )
     {
         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 );
+                            NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_RO_FLOW_SENSOR_INVALID_CAL_RECORD );
     }
 
     // Read flow at the control set