Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -rd7be59e36db5e9899b02dd0bfadadc50fed934c0 -r261cfc6d93996e76e26c1e9c3f5740077ad2ec22
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision d7be59e36db5e9899b02dd0bfadadc50fed934c0)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 261cfc6d93996e76e26c1e9c3f5740077ad2ec22)
@@ -21,6 +21,7 @@
 #include "mibspi.h"
 
 #include "ConcentratePumps.h"
+#include "FlowSensors.h"
 #include "FPGA.h"
 #include "InternalADC.h"
 #include "NVDataMgmt.h"
@@ -56,7 +57,7 @@
 #define ROP_RAMP_UP_CONTROL_INTERVAL                   ( 500 / TASK_GENERAL_INTERVAL )             ///< Interval (ms/task time) at which the RO pump is controlled.
 #define ROP_RAMP_UP_P_COEFFICIENT                      0.22F                                       ///< P term for RO pump ramp up to flow control.
 #define ROP_FLOW_CONTROL_P_COEFFICIENT                 0.4F                                        ///< P term for RO pump flow control.
-#define ROP_FLOW_CONTROL_I_COEFFICIENT                 0.05F                                       ///< I term for RO pump flow control.
+#define ROP_FLOW_CONTROL_I_COEFFICIENT                 0.3F                                        ///< I term for RO pump flow control.
 #define ROP_MAX_PRESSURE_P_COEFFICIENT                 0.01F                                       ///< P term for RO pump max pressure control.
 #define ROP_MAX_PRESSURE_I_COEFFICIENT                 0.01F                                       ///< I term for RO pump max pressure control.
 
@@ -397,7 +398,7 @@
     {
         // The feedback voltage is on the 0V line so when the duty cycle is 0, the feedback is 2.5V
         // The duty cycle is calculated by getting the 1 - (ratio of feedback / to the voltage at 0 percent duty cycle).
-        roPumpFeedbackDutyCyclePct =  1.0 - ( roFeedbackVoltage / ROP_FEEDBACK_0_PCT_DUTY_CYCLE_VOLTAGE );
+        roPumpFeedbackDutyCyclePct =  1.0F - ( roFeedbackVoltage / ROP_FEEDBACK_0_PCT_DUTY_CYCLE_VOLTAGE );
 
         // To monitor the flow, the control mode must be in closed loop mode and the pump should be control to flow state
         // If the pump is controlled to the maximum pressure, the flow might be different from the target flow for more than 10%
@@ -600,6 +601,18 @@
 
 /*********************************************************************//**
  * @brief
+ * The resetROGenerateVolumeL function resets the RO generated volume in liters.
+ * @details Inputs: none
+ * @details Outputs: roVolumeL
+ * @return none
+ *************************************************************************/
+void resetROGenerateVolumeL( void )
+{
+    roVolumeL = 0.0;
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleROPumpOffState function handles the RO pump off state of the
  * controller state machine.
  * @details Inputs: roPumpControlMode, roPumpPWMDutyCyclePctSet,
@@ -649,7 +662,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 flowRateDeviation = fabs( targetFlowRate - actualFlowRate ) / targetFlowRate;
     BOOL isFlowOutOfRange = flowRateDeviation > ROP_FLOW_TARGET_TOLERANCE;
     F32 targetPressure    = getTargetROPumpPressure();
@@ -713,7 +726,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 ) );
         }
 
         setROPumpControlSignalDutyCycle( roPumpDutyCyclePctSet );
@@ -749,7 +762,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 ) );
         }
 
         setROPumpControlSignalDutyCycle( roPumpDutyCyclePctSet );
@@ -846,10 +859,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;
@@ -931,6 +943,14 @@
         {
             result = setROPumpTargetFlowRateLPM( flow, MAX_ALLOWED_PRESSURE_PSI );
         }
+
+        // If the flow is less than a very small number, it means 0 LPM flow rate has been requested
+        // and this is coming from Dialin so the user requested the pump to stop
+        if ( fabs( flow ) < NEARLY_ZERO )
+        {
+            signalROPumpHardStop();
+            result = TRUE;
+        }
     }
 
     return result;