Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r09bab7093c44ef358e505bfcef016ffb39f56bd9 -r3555f182983cb3852f1e414017d11aeb537d3274
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 09bab7093c44ef358e505bfcef016ffb39f56bd9)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 3555f182983cb3852f1e414017d11aeb537d3274)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file SystemCommMessages.h
 *
-* @author (last) Quang Nguyen
-* @date (last) 24-Aug-2020
+* @author (last) H. Nguyen
+* @date (last) 22-Oct-2021
 *
 * @author (original) Dara Navaei
 * @date (original) 05-Nov-2019
@@ -32,6 +32,7 @@
 #include "NVDataMgmt.h"
 #include "Reservoirs.h"
 #include "ROPump.h"
+#include "DialysateFlow.h"
 #include "Switches.h"
 #include "TemperatureSensors.h"
 #include "Thermistors.h"
@@ -88,6 +89,9 @@
 // MSG_ID_DG_VALVES_STATES
 BOOL broadcastValvesStates( U16 valvesStates );
 
+// MSG_ID_DG_DIALYSATE_FLOW_METER_DATA
+BOOL broadcastDialysateFlowData( const DIALYSATE_FLOW_METER_DATA_T * const flowData );
+
 // MSG_ID_RO_PUMP_DATA
 BOOL broadcastROPumpData( RO_PUMP_DATA_T *pumpData );
 
@@ -252,9 +256,15 @@
 // MSG_ID_RO_MEASURED_FLOW_OVERRIDE:
 void handleTestROMeasuredFlowOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_DIALYSATE_MEASURED_FLOW_OVERRIDE:
+void handleTestDialysateMeasuredFlowOverrideRequest( MESSAGE_T *message );
+
 // MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE:
 void handleTestROPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_DIALYSATE_FLOW_SEND_INTERVAL_OVERRIDE:
+void handleTestDialysateFlowDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
 // MSG_ID_DRAIN_PUMP_SET_RPM_OVERRIDE
 void handleTestDrainPumpRPMOverrideRequest( MESSAGE_T *message );