Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r24e6e4df038de04e13363d1eb929b4fd693046ff -r334cbb3b55e65147523b3cc952c8ada41192441f
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 24e6e4df038de04e13363d1eb929b4fd693046ff)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 334cbb3b55e65147523b3cc952c8ada41192441f)
@@ -8,7 +8,7 @@
 * @file    ROPump.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      25-May-2022
+* @date    (last)      03-Aug-2022
 *
 * @author  (original)  Sean
 * @date    (original)  04-Apr-2020
@@ -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.
 
@@ -315,7 +316,7 @@
 void signalROPumpHardStop( void )
 {
     stopROPump();
-    targetROPumpFlowRateLPM          = 0;
+    targetROPumpFlowRateLPM       = 0;
     roPumpState                   = RO_PUMP_OFF_STATE;
     roPumpPWMDutyCyclePct         = 0.0;
     roPumpOpenLoopTargetDutyCycle = 0.0;
@@ -505,7 +506,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 );
@@ -612,7 +613,7 @@
     RO_PUMP_STATE_T state = RO_PUMP_OFF_STATE;
 
     // If there is a flow, transition to the PI controller to get the corresponding pressure of that flow
-    if ( getTargetROPumpFlowRateLPM() > 0 && roPumpControlMode == PUMP_CONTROL_MODE_CLOSED_LOOP )
+    if ( getTargetROPumpFlowRateLPM() > 0.0F && roPumpControlMode == PUMP_CONTROL_MODE_CLOSED_LOOP )
     {
         // Set pump to on
         isROPumpOn = TRUE;
@@ -622,7 +623,7 @@
     }
     // If the target duty cycle is greater than zero (minimum is 10%) and the mode has been set to open
     // loop, set the duty cycle
-    if ( roPumpOpenLoopTargetDutyCycle > 0 && roPumpControlMode == PUMP_CONTROL_MODE_OPEN_LOOP )
+    if ( roPumpOpenLoopTargetDutyCycle > 0.0F && roPumpControlMode == PUMP_CONTROL_MODE_OPEN_LOOP )
     {
         setROPumpControlSignalDutyCycle( roPumpOpenLoopTargetDutyCycle );
         isROPumpOn = TRUE;
@@ -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;
@@ -931,6 +931,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;