Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rc9aa3971be05f25a7b0d7124e57cc60617c90ad7 -r3edf8084a5028ee0d00a3fba496284e593e4254d
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision c9aa3971be05f25a7b0d7124e57cc60617c90ad7)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 3edf8084a5028ee0d00a3fba496284e593e4254d)
@@ -3,12 +3,12 @@
 
 #include "BoostPump.h"
 #include "Compatible.h"
+#include "Flow.h"
 #include "Level.h"
 #include "Messaging.h"
 #include "OperationModes.h"
 #include "PAL.h"
 #include "Pressure.h"
-//#include "PressureSensor.h"
 #include "ROPump.h"
 #include "SystemCommRO.h"
 #include "Utilities.h"
@@ -71,7 +71,10 @@
     MSG_ID_RO_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
     MSG_ID_RO_DEBUG_EVENT,
     MSG_ID_RO_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
-    MSG_ID_RO_LEVEL_OVERRIDE_REQUEST
+    MSG_ID_RO_LEVEL_OVERRIDE_REQUEST,
+    MSG_ID_RO_FLOWS_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
+    MSG_ID_RO_FLOW_RATE_OVERRIDE_REQUEST,
+    MSG_ID_RO_FLOW_TEMP_OVERRIDE_REQUEST
 };
 
 /// Message handling function table
@@ -93,7 +96,10 @@
     &testPressureSensorDataPublishIntervalOverride,
     &handleUnhandledMsg,
     &testLevelsDataPublishIntervalOverride,
-    &testLevelStateOverride
+    &testLevelStateOverride,
+    &testFlowSensorDataPublishIntervalOverride,
+    &testFlowSensorReadingsOverride,
+    &testFlowSensorTemperatureReadingsOverride
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLERS) / sizeof(MsgFuncPtr))