Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r3dd12fb9d032f85126db82ca48812a4652a5b75f -r5c53288436774f0cf6a24132ace29a64a66d619d
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 3dd12fb9d032f85126db82ca48812a4652a5b75f)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 5c53288436774f0cf6a24132ace29a64a66d619d)
@@ -21,6 +21,7 @@
 #include "mibspi.h"
 
 #include "ConcentratePumps.h"
+#include "FlowSensors.h"
 #include "FPGA.h"
 #include "InternalADC.h"
 #include "NVDataMgmt.h"
@@ -649,7 +650,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();
@@ -713,7 +714,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 );
@@ -749,7 +750,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 );
@@ -846,10 +847,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;