Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r8af127784aeb07ce7bfc2d6ea6eb2e3e3e68ea32 -r66cc826068b54bc436cde0fae70a05ba6c1ac974
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 8af127784aeb07ce7bfc2d6ea6eb2e3e3e68ea32)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 66cc826068b54bc436cde0fae70a05ba6c1ac974)
@@ -8,7 +8,7 @@
 * @file    ROPump.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      24-Feb-2022
+* @date    (last)      31-Mar-2022
 *
 * @author  (original)  Sean
 * @date    (original)  04-Apr-2020
@@ -139,8 +139,8 @@
 static S32 measuredFlowReadingsSum = 0;                                                            ///< Raw flow reading sums for averaging.
 static U32 flowFilterCounter = 0;                                                                  ///< Flow filtering counter.
 static DG_FLOW_SENSORS_CAL_RECORD_T flowSensorsCalRecord;                                          ///< Flow sensors calibration record.
+static OVERRIDE_F32_T measuredROFlowRateWithConcPumpsLPM = { 0.0, 0.0, 0.0, 0 };                   ///< Measure RO flow rate with concentrate pumps (L/min).
 static DG_RO_PUMP_CAL_RECORD_T roPumpCalRecord;                                                    ///< RO pump calibration record.
-static F32 rawFlowLP;                                                                              ///< Raw flow rate without subtracting the CP1 and CP2 in L/min.
 
 // ********** private function prototypes **********
 
@@ -198,7 +198,6 @@
     roPumpControlMode                 = NUM_OF_PUMP_CONTROL_MODES;
     isROPumpOn                        = FALSE;
     roPumpFeedbackDutyCyclePct        = 0.0;
-    rawFlowLP                         = 0.0;
 }
 
 /*********************************************************************//**
@@ -365,9 +364,9 @@
                    flow     * flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].gain             +
                               flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].offset;
 
-        rawFlowLP                  = flow;
-        measuredROFlowRateLPM.data = flow - ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) / ML_PER_LITER ) -
-                                            ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB ) / ML_PER_LITER );
+        measuredROFlowRateWithConcPumpsLPM.data = flow;
+        measuredROFlowRateLPM.data              = flow - ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) / ML_PER_LITER ) -
+                                                         ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB ) / ML_PER_LITER );
 
        // If the flow is less than a certain value, FPGA will return 0xFFFF meaning that
        // the flow is 0.
@@ -546,6 +545,19 @@
 
 /*********************************************************************//**
  * @brief
+ * The getMeasuredROFlowRateWithConcPumpsLPM function gets the measured RO
+ * pump flow rate with the concentrate pumps.
+ * @details Inputs: measuredROFlowRateWithConcPumpsLPM
+ * @details Outputs: measuredROFlowRateWithConcPumpsLPM
+ * @return the current RO pump flow rate with the concentrate pumps (in L/min).
+ *************************************************************************/
+F32  getMeasuredROFlowRateWithConcPumpsLPM( void )
+{
+    return getF32OverrideValue( &measuredROFlowRateWithConcPumpsLPM );
+}
+
+/*********************************************************************//**
+ * @brief
  * The getTargetROPumpPressure function gets the current target RO pump
  * pressure.
  * @details Inputs: targetROPumpPressure
@@ -808,15 +820,14 @@
     {
         RO_PUMP_DATA_T pumpData;
 
-        pumpData.roPumpTgtFlowRateLM  = getTargetROPumpFlowRate();
-        pumpData.roPumpTgtPressure    = getTargetROPumpPressure();
-        pumpData.measROFlowRate       = getMeasuredROFlowRateLPM();
-        pumpData.roPumpDutyCycle      = roPumpDutyCyclePctSet * FRACTION_TO_PERCENT_FACTOR;
-        pumpData.roPumpState          = (U32)roPumpState;
-        pumpData.roPumpFBDutyCycle    = roPumpFeedbackDutyCyclePct * FRACTION_TO_PERCENT_FACTOR;
-        pumpData.roPumpRawFlowRateMLP = rawFlowLP * ML_PER_LITER;
+        pumpData.roPumpTgtFlowRateLM         = getTargetROPumpFlowRate();
+        pumpData.roPumpTgtPressure           = getTargetROPumpPressure();
+        pumpData.measROFlowRate              = getMeasuredROFlowRateLPM();
+        pumpData.roPumpDutyCycle             = roPumpDutyCyclePctSet * FRACTION_TO_PERCENT_FACTOR;
+        pumpData.roPumpState                 = (U32)roPumpState;
+        pumpData.roPumpFBDutyCycle           = roPumpFeedbackDutyCyclePct * FRACTION_TO_PERCENT_FACTOR;
+        pumpData.roPumpMeasFlowWithConcPumps = getMeasuredROFlowRateWithConcPumpsLPM();
 
-
         broadcastData( MSG_ID_RO_PUMP_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&pumpData, sizeof( RO_PUMP_DATA_T ) );
         roPumpDataPublicationTimerCounter = 0;
     }