Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -re6c4c61c793a91f9ed9dfe969e01bdeee565347d -r44f739bf3e9dfe0bfb5910a6a32fc4c5b1533af3
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision e6c4c61c793a91f9ed9dfe969e01bdeee565347d)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 44f739bf3e9dfe0bfb5910a6a32fc4c5b1533af3)
@@ -76,7 +76,7 @@
  /// Initial conversion factor from target flow rate to PWM duty cycle estimate.
 #define ROP_FLOW_TO_PWM_DC(flow)                       ( ROP_FLOW_TO_PWM_SLOPE * flow + ROP_FLOW_TO_PWM_INTERCEPT )
 #define MAX_ALLOWED_FLOW_DEVIATION                     0.1F                                        ///< Max allowed deviation from target flow.
-#define FLOW_OUT_OF_RANGE_PERSISTENT_INTERVAL          ( 12 * MS_PER_SECOND )                      ///< Flow out of range time out in counts.
+#define FLOW_OUT_OF_RANGE_TIME_OUT_MS                  ( 12 * MS_PER_SECOND )                      ///< Flow out of range time out in counts.
 #define MAX_PRESSURE_TARGET_TOLERANCE                  5                                           ///< Pressure tolerance from maximum set pressure by user in psi.
 #define MAX_ALLOWED_PRESSURE_PSI                       130                                         ///< Maximum allowed pressure that the RO pump can go to.
 #define MIN_ALLOWED_PRESSURE_PSI                       10                                          ///< Minimum allowed pressure that the RO pump can go to.
@@ -167,8 +167,8 @@
                             MIN_RO_PUMP_DUTY_CYCLE, MAX_RO_PUMP_DUTY_CYCLE );
 
     // Initialize the persistent alarm for flow out of upper and lower range
-    initPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE, FLOW_OUT_OF_RANGE_PERSISTENT_INTERVAL, FLOW_OUT_OF_RANGE_PERSISTENT_INTERVAL );
-    initPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE, FLOW_OUT_OF_RANGE_PERSISTENT_INTERVAL, FLOW_OUT_OF_RANGE_PERSISTENT_INTERVAL );
+    initPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE, FLOW_OUT_OF_RANGE_TIME_OUT_MS, FLOW_OUT_OF_RANGE_TIME_OUT_MS );
+    initPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE, FLOW_OUT_OF_RANGE_TIME_OUT_MS, FLOW_OUT_OF_RANGE_TIME_OUT_MS );
 
     // Initialize the persistent alarm for max allowed pressure out of range
     initPersistentAlarm( ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE, MAX_PRESSURE_OUT_OF_RANGE_PERSISTENT_INTERVAL,
@@ -221,7 +221,7 @@
             // For now maximum allowed pressure is inserted into the target pressure override
             // if the target flow rate exceeded the max pressure, it will set the maximum pressure
             targetROPumpMaxPressure = maxPressure;
-            targetROPumpFlowRateLPM    = roFlowRate;
+            targetROPumpFlowRateLPM = roFlowRate;
             roPumpControlMode       = PUMP_CONTROL_MODE_CLOSED_LOOP;
             roPumpState             = RO_PUMP_RAMP_UP_TO_TARGET_FLOW_STATE;
             // Get the initial guess of the duty cycle
@@ -776,11 +776,12 @@
     {
         RO_PUMP_DATA_T pumpData;
 
-        pumpData.roPumpTgtFlowRateLM = getTargetROPumpFlowRateLPM();
-        pumpData.roPumpTgtPressure   = getTargetROPumpPressurePSI();
-        pumpData.roPumpDutyCycle     = roPumpDutyCyclePctSet * FRACTION_TO_PERCENT_FACTOR;
-        pumpData.roPumpState         = (U32)roPumpState;
-        pumpData.roPumpFBDutyCycle   = roPumpFeedbackDutyCyclePct * FRACTION_TO_PERCENT_FACTOR;
+        pumpData.roPumpTgtFlowRateLPM = getTargetROPumpFlowRateLPM();
+        pumpData.roPumpTgtPressurePSI = getTargetROPumpPressurePSI();
+        pumpData.roPumpDutyCycle      = roPumpDutyCyclePctSet * FRACTION_TO_PERCENT_FACTOR;
+        pumpData.roMeasFlowRateLPM    = getMeasuredFlowRateLPM( RO_FLOW_SENSOR );
+        pumpData.roPumpState          = (U32)roPumpState;
+        pumpData.roPumpFBDutyCycle    = roPumpFeedbackDutyCyclePct * FRACTION_TO_PERCENT_FACTOR;
 
         broadcastData( MSG_ID_RO_PUMP_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&pumpData, sizeof( RO_PUMP_DATA_T ) );
         roPumpDataPublicationTimerCounter = 0;