Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -r4b9ae4e44d44ee6577fec4c8b75aa160fea04cc7 -r4daa230ef3173ca71bab91c0c28457e6ac341797
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 4b9ae4e44d44ee6577fec4c8b75aa160fea04cc7)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 4daa230ef3173ca71bab91c0c28457e6ac341797)
@@ -53,7 +53,8 @@
 #define DRP_CONTROL_INTERVAL                   ( 200 / TASK_GENERAL_INTERVAL )                                  ///< Interval (ms/task time) at which the Drain pump is controlled.
 #define DRP_CONTROL_MAX_ALLOWED_PPO_PSI        30.0F                                                            ///< Drain pump maximum allowed PPo pressure in psi.
 #define DRP_CONTROL_MAX_ALLOWED_PDR_PSI        40.0F                                                            ///< Drain pump maximum allowed PDr pressure in psi.
-#define DRP_CONTROL_PSI_TO_DAC_P_TERM          1                                                                ///< Drain pump psi to DAC conversion.
+#define DRP_CONTROL_PSI_TO_DAC_P_TERM          0.2F                                                             ///< Drain pump psi to DAC conversion.
+#define DRP_CONTROL_FLOW_TO_DAC_P_TERM         0.5F                                                             ///< Drain pump flow (L/min) to DAC conversion.
 #define DRP_CONTROL_PRES_TO_MAX_THRESHOLD_PSI  1.0F                                                             ///< Drain pump pressure to maximum pressure threshold in psi.
 #define DRP_CONTROL_MIN_DAC_CHANGE             1                                                                ///< Drain pump minimum DAC change
 
@@ -456,10 +457,10 @@
             if ( DRAIN_PUMP_CONTROL_TO_TARGET_STATE == pendingDrainPumpCmd )
             {
                 targetDrainPumpOutletFlowLPM = pendingDrainPumpCmdTarget;
-                hasClosedLoopBeenRequested    = TRUE;
-                drainPumpDAC                  = DRAIN_PUMP_MIN_DAC;
-                drainPumpControlMode          = PUMP_CONTROL_MODE_CLOSED_LOOP;
-                drainPumpControlModeSet       = drainPumpControlMode;
+                hasClosedLoopBeenRequested   = TRUE;
+                drainPumpDAC                 = DRAIN_PUMP_MIN_DAC;
+                drainPumpControlMode         = PUMP_CONTROL_MODE_CLOSED_LOOP;
+                drainPumpControlModeSet      = drainPumpControlMode;
             }
             else if ( DRAIN_PUMP_OPEN_LOOP_STATE == pendingDrainPumpCmd )
             {
@@ -656,14 +657,14 @@
         U32 tempDACSet;
         F32 drainPumpOutletPressurePSI = getMeasuredDGPressure( PRESSURE_SENSOR_DRAIN_PUMP_OUTLET );
         F32 roPumpOutletPressurePSI    = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_OUTLET );
+        F32 targetROFlowLPM            = getDrainPumpTargetOutletFlowLPM();
+        F32 msrdROFlowLPM              = getMeasuredFlowRateLPM( RO_FLOW_SENSOR );
+        F32 flowSubLPM                 = msrdROFlowLPM - targetROFlowLPM;
 
         if ( TRUE == isDrainPumpControlInFlowMode )
         {
-            // If the flow control flag is on, Control to flow
-            F32 targetROFlowLPM = getDrainPumpTargetOutletFlowLPM();
-            F32 msrdROFlowLPM   = getMeasuredFlowRateLPM( RO_FLOW_SENSOR );
-            F32 dac             = runPIController( PI_CONTROLLER_ID_DRAIN_PUMP, targetROFlowLPM, msrdROFlowLPM );
-            drainPumpDACSet     = (U32)( dac + FLOAT_TO_INT_ROUNDUP_OFFSET );
+            F32 dac         = runPIController( PI_CONTROLLER_ID_DRAIN_PUMP, targetROFlowLPM, msrdROFlowLPM );
+            drainPumpDACSet = (U32)( dac + FLOAT_TO_INT_ROUNDUP_OFFSET );
 
             if ( ( drainPumpOutletPressurePSI > DRP_CONTROL_MAX_ALLOWED_PDR_PSI ) || ( roPumpOutletPressurePSI > DRP_CONTROL_MAX_ALLOWED_PPO_PSI ) )
             {
@@ -694,6 +695,14 @@
                 tempDACSet       = (U32)( ( fabs(maxPresPSI) * DRP_CONTROL_PSI_TO_DAC_P_TERM ) + FLOAT_TO_INT_ROUNDUP_OFFSET );
                 drainPumpDACSet += ( tempDACSet > 0.0F ? tempDACSet : DRP_CONTROL_MIN_DAC_CHANGE );
             }
+
+            if ( flowSubLPM > NEARLY_ZERO )
+            {
+                // If measured flow if greater than the target flow, adjust the DAC to lower the flow rate
+                tempDACSet       = (U32)( ( flowSubLPM * DRP_CONTROL_FLOW_TO_DAC_P_TERM ) + FLOAT_TO_INT_ROUNDUP_OFFSET );
+                drainPumpDACSet -= ( tempDACSet > 0.0F ? tempDACSet : DRP_CONTROL_MIN_DAC_CHANGE );
+            }
+
         }
 
         // Check the DAC to make sure it is not out the min and max ranges of the drain pump