Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r26f63d0260a3c35277e3e6dbca3573c253775318 -r1b95ae077de1d01a314be8cc011662ab508fba10
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 26f63d0260a3c35277e3e6dbca3573c253775318)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 1b95ae077de1d01a314be8cc011662ab508fba10)
@@ -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
@@ -24,13 +24,15 @@
 #include "Fans.h"
 #include "FluidLeak.h"
 #include "LoadCell.h"
+#include "MessageSupport.h"
 #include "ModeChemicalDisinfect.h"
 #include "ModeFlush.h"
 #include "ModeHeatDisinfect.h"
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"
 #include "Reservoirs.h"
 #include "ROPump.h"
+#include "DialysateFlow.h"
 #include "Switches.h"
 #include "TemperatureSensors.h"
 #include "Thermistors.h"
@@ -52,6 +54,8 @@
 
 // ********** public function prototypes **********
 
+U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq );
+
 // ACK MSG
 BOOL sendACKMsg( MESSAGE_T *message );
 
@@ -85,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 );
 
@@ -249,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
 void handleTestSetDrainPumpRPM( MESSAGE_T *message );
 
@@ -339,7 +352,10 @@
 // MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE
 void handleTestROPumpDutyCycleOverride( MESSAGE_T *message );
 
-// MSG_ID_DG_RO_PUMP_TARGET_FLOW_OVERRIDE
+// MSG_ID_DG_RO_FLOW_RATE_OVERRIDE
+void handleTestMeasuredROFlowRateOverride( MESSAGE_T *message );
+
+// MSG_ID_DG_SET_RO_PUMP_TARGET_FLOW
 void handleTestROPumpTargetFlowOverride( MESSAGE_T *message );
 
 // MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE
@@ -390,8 +406,8 @@
 // MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE
 void handleFilterFlushTimePeriodOverride( MESSAGE_T *message );
 
-// MSG_ID_DG_FANS_RPM_OVERRIDE
-void handleFansRPMOverride( MESSAGE_T *message );
+// MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION
+void handleTestBlockMessagesRequest( MESSAGE_T *message );
 
 // MSG_ID_DG_STOP_RTC_CLOCK
 void handleStopDGRTCClock( MESSAGE_T * message );