Index: firmware/App/Monitors/Flow.c
===================================================================
diff -u -r5aaed18e3cd460c091c36c95c81635273bad61c6 -r7b9a8c0cb9986368e1e38fcdb9daaf3cf707dfd2
--- firmware/App/Monitors/Flow.c	(.../Flow.c)	(revision 5aaed18e3cd460c091c36c95c81635273bad61c6)
+++ firmware/App/Monitors/Flow.c	(.../Flow.c)	(revision 7b9a8c0cb9986368e1e38fcdb9daaf3cf707dfd2)
@@ -368,12 +368,9 @@
     {
         FLOW_TEMP_DATA_T data;
 
-        data.FlowFMS = getFilteredFlow( FLOW_SENSOR_WATER_INLET );
-        data.FlowFMP = getFilteredFlow( FLOW_SENSOR_RO_OUTLET );
+        data.FlowP7 = getFilteredFlow( P7_FLOW );
+        data.FlowP16 = getFilteredFlow( P16_FLOW );
 
-        data.TempFMS = getFilteredFlowSensorTemperature( FLOW_SENSOR_WATER_INLET );
-        data.TempFMP = getFilteredFlowSensorTemperature( FLOW_SENSOR_RO_OUTLET );
-
         broadcastData( MSG_ID_RO_FLOW_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( FLOW_TEMP_DATA_T ) );
         flowsDataPublicationTimerCounter = 0;
     }
@@ -412,13 +409,13 @@
  * ID and override value of the flow rate for that sensor.
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-//BOOL testFlowSensorFilteredReadingsOverride( MESSAGE_T *message )
-//{
-//    BOOL result = f32ArrayOverride( message, &filteredcurrentFlowReadings[0], NUM_OF_FLOW_SENSORS - 1 );
-//
-//    return result;
-//}
+BOOL testFlowSensorFilteredReadingsOverride( MESSAGE_T *message )
+{
+    BOOL result = f32ArrayOverride( message, &filteredcurrentFlowReadings[0], NUM_OF_FLOW_SENSORS - 1 );
 
+    return result;
+}
+
 /*********************************************************************//**
  * @brief
  * The testFlowSensorFilteredTemperatureReadingsOverride function overrides the
@@ -429,11 +426,11 @@
  * ID and override value of the flow sensor temperature.
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-//BOOL testFlowSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message )
-//{
-//    BOOL result = f32ArrayOverride( message, &filteredcurrentFlowTempReadings[0], NUM_OF_FLOW_SENSORS - 1 );
-//
-//    return result;
-//}
+BOOL testFlowSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message )
+{
+    BOOL result = f32ArrayOverride( message, &filteredcurrentFlowTempReadings[0], NUM_OF_FLOW_SENSORS - 1 );
+
+    return result;
+}
 
 /**@}*/