Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r124e0c8f18d85527dc89d7d09adad583866a85de -r05505352232580a265985678f2d423b5688e8951
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 124e0c8f18d85527dc89d7d09adad583866a85de)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 05505352232580a265985678f2d423b5688e8951)
@@ -21,6 +21,7 @@
 #include "mibspi.h"
 
 #include "ConcentratePumps.h"
+#include "FlowSensors.h"
 #include "FPGA.h"
 #include "InternalADC.h"
 #include "NVDataMgmt.h"
@@ -504,7 +505,7 @@
     BOOL calStatus            = FALSE;
 
     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 );
+                                     NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_RO_FLOW_SENSOR_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 );
@@ -648,7 +649,7 @@
     // Get the current pressure from the sensor
     F32 actualPressure    = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_OUTLET );
     F32 targetFlowRate    = getTargetROPumpFlowRateLPM();
-    F32 actualFlowRate    = (F32)getMeasuredROFlowRateLPM();
+    F32 actualFlowRate    = getMeasuredFlowRateLPM( RO_FLOW_SENSOR ); //(F32)getMeasuredROFlowRateLPM();
     F32 flowRateDeviation = fabs( targetFlowRate - actualFlowRate ) / targetFlowRate;
     BOOL isFlowOutOfRange = flowRateDeviation > ROP_FLOW_TARGET_TOLERANCE;
     F32 targetPressure    = getTargetROPumpPressure();
@@ -712,7 +713,7 @@
         }
         else
         {
-            roPumpDutyCyclePctSet = runPIController( PI_CONTROLLER_ID_RO_PUMP_FLOW, getTargetROPumpFlowRateLPM(), getMeasuredROFlowRateLPM() );
+            roPumpDutyCyclePctSet = runPIController( PI_CONTROLLER_ID_RO_PUMP_FLOW, getTargetROPumpFlowRateLPM(), getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) /*getMeasuredROFlowRateLPM()*/ );
         }
 
         setROPumpControlSignalDutyCycle( roPumpDutyCyclePctSet );
@@ -748,7 +749,7 @@
         }
         else
         {
-            roPumpDutyCyclePctSet = runPIController( PI_CONTROLLER_ID_RO_PUMP_MAX_PRES, getTargetROPumpFlowRateLPM(), getMeasuredROFlowRateLPM() );
+            roPumpDutyCyclePctSet = runPIController( PI_CONTROLLER_ID_RO_PUMP_MAX_PRES, getTargetROPumpFlowRateLPM(), getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) /*getMeasuredROFlowRateLPM()*/ );
         }
 
         setROPumpControlSignalDutyCycle( roPumpDutyCyclePctSet );
@@ -845,10 +846,9 @@
     if ( ++roPumpDataPublicationTimerCounter >= getU32OverrideValue( &roPumpDataPublishInterval ) )
     {
         RO_PUMP_DATA_T pumpData;
-
         pumpData.roPumpTgtFlowRateLM         = getTargetROPumpFlowRateLPM();
         pumpData.roPumpTgtPressure           = getTargetROPumpPressure();
-        pumpData.measROFlowRate              = getMeasuredROFlowRateLPM();
+        pumpData.measROFlowRate              = getMeasuredFlowRateLPM( RO_FLOW_SENSOR ); //getMeasuredROFlowRateLPM();
         pumpData.roPumpDutyCycle             = roPumpDutyCyclePctSet * FRACTION_TO_PERCENT_FACTOR;
         pumpData.roPumpState                 = (U32)roPumpState;
         pumpData.roPumpFBDutyCycle           = roPumpFeedbackDutyCyclePct * FRACTION_TO_PERCENT_FACTOR;