Index: MsgDefs.h
===================================================================
diff -u -rfa80047c483e4ce4ad4efd08f0ef45e11c326d8c -r12efd87ba83d1f2a57b141c610045725b5a9e3f8
--- MsgDefs.h	(.../MsgDefs.h)	(revision fa80047c483e4ce4ad4efd08f0ef45e11c326d8c)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 12efd87ba83d1f2a57b141c610045725b5a9e3f8)
@@ -83,6 +83,8 @@
     MSG_ID_RO_OP_MODE_DATA = 0x33,                                                  ///< RO broadcast operation mode data
     MSG_ID_RO_PRESSURES_DATA = 0x34,                                                ///< RO broadcast pressures data
     MSG_ID_RO_LEVEL_DATA = 0x35,                                                    ///< RO broadcast level data
+    MSG_ID_RO_FLOW_DATA = 0x36,                                                     ///< RO broadcast flow data
+    MSG_ID_RO_CONDUCTIVITY_DATA = 0x37,                                             ///< RO broadcast conductivity data
 
     // service/test CAN messages
     MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000,                                        ///< First TD test message ID
@@ -200,6 +202,14 @@
     MSG_ID_RO_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB00E,                  ///< RO pressures data publish interval override request
     MSG_ID_RO_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB00F,                     ///< RO level data publish interval override request
     MSG_ID_RO_LEVEL_OVERRIDE_REQUEST = 0xB010,                                      ///< RO override request for level sensor.
+    MSG_ID_RO_FLOWS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB011,                     ///< RO flows data publish interval override request
+    MSG_ID_RO_FLOW_RATE_OVERRIDE_REQUEST = 0xB012,                                  ///< RO override request for flow rate (mL/min)
+    MSG_ID_RO_FLOW_TEMP_OVERRIDE_REQUEST = 0xB013,                                  ///< RO override request for flow temperature (deg C)
+    MSG_ID_RO_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB014,              ///< RO conductivity data publish interval override request
+    MSG_ID_RO_CONDUCTIVITY_OVERRIDE_REQUEST = 0xB015,                               ///< RO conductivity override request
+    MSG_ID_RO_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST = 0xB016,                          ///< RO conductivity sensor temperature override request
+    MSG_ID_RO_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST = 0xB017,                    ///< RO conductivity sensor read count override request
+    MSG_ID_RO_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST = 0xB018,                   ///< RO conductivity sensor error count override request
 
     MSG_ID_TD_DEBUG_EVENT = 0xFFF1,                                                 ///< TD debug event text to be logged in event log
     MSG_ID_DD_DEBUG_EVENT = 0xFFF2,                                                 ///< DD debug event text to be logged in event log