Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r2d8f95eaae3bcb7027f5e96809ddc6e9c0efbc4c -rde91824d9790638e0a17fa0278d22a3f57ed28c3
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 2d8f95eaae3bcb7027f5e96809ddc6e9c0efbc4c)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision de91824d9790638e0a17fa0278d22a3f57ed28c3)
@@ -18,12 +18,13 @@
 #ifndef __SYSTEM_COMM_MESSAGES_H__
 #define __SYSTEM_COMM_MESSAGES_H__
 
+#include "CommBuffers.h"
 #include "DGCommon.h"
 #include "DrainPump.h"
 #include "Fans.h"
 #include "FluidLeak.h"
-#include "Heaters.h"
 #include "LoadCell.h"
+#include "MessageSupport.h"
 #include "ModeChemicalDisinfect.h"
 #include "ModeFlush.h"
 #include "ModeHeatDisinfect.h"
@@ -47,11 +48,22 @@
 
 // ********** public definitions **********
 
+#define ACK_REQUIRED                    TRUE        ///< Require an ACK.
+#define ACK_NOT_REQUIRED                FALSE       ///< Not require an ACK.
+
 // ********** public function prototypes **********
 
+U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq );
+
 // ACK MSG
 BOOL sendACKMsg( MESSAGE_T *message );
 
+// MSG_ID_DG_EVENT
+BOOL sendEvent( DG_EVENT_ID_T event, EVENT_DATA_T dat1, EVENT_DATA_T dat2 );
+
+// Serialize message
+U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq );
+
 // MSG_ID_ALARM_TRIGGERED
 BOOL broadcastAlarmTriggered( U32 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 );
 
@@ -82,18 +94,12 @@
 // MSG_ID_DRAIN_PUMP_DATA
 BOOL broadcastDrainPumpData( DRAIN_PUMP_DATA_T *drainPumpData );
 
-// MSG_ID_DG_CONCENTRATE_PUMP_DATA
-BOOL broadcastConcentratePumpData( void * concentratePumpDataPtr );
-
 // MSG_ID_DG_PRESSURES_DATA
 BOOL broadcastPressureSensorsData( F32 measROIn, F32 measROOut, F32 measDrainIn, F32 measDrainOut );
 
 // MSG_ID_DG_RESERVOIR_DATA
 BOOL broadcastReservoirData( U32 resID, U32 fillToVol, U32 drainToVol );
 
-// MSG_ID_HEATERS_READINGS
-BOOL broadcastHeatersData( HEATERS_DATA_T *heatersData );
-
 // MSG_ID_TEMPERATURE_SENSORS_READINGS
 BOOL broadcastTemperatureSensorsData( TEMPERATURE_SENSORS_DATA_T* tempSensorsData );
 
@@ -336,9 +342,6 @@
 // MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE
 void handleTestROPumpDutyCycleOverride( MESSAGE_T *message );
 
-// MSG_ID_DG_RO_FLOW_RATE_OVERRIDE
-void handleTestMeasuredROFlowRateOverride( MESSAGE_T *message );
-
 // MSG_ID_DG_RO_PUMP_TARGET_FLOW_OVERRIDE
 void handleTestROPumpTargetFlowOverride( MESSAGE_T *message );
 
@@ -384,11 +387,14 @@
 // MSG_ID_DG_START_STOP_CHEM_DSINFECT
 BOOL handleStartStopDGChemicalDisinfect( MESSAGE_T *message );
 
+// MSG_ID_DG_OP_MODE_PUBLISH_INTERVAL_OVERRIDE
+void handleSetDGOpModeBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
 // MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE
 void handleFilterFlushTimePeriodOverride( MESSAGE_T *message );
 
-// MSG_ID_DG_OP_MODE_PUBLISH_INTERVAL_OVERRIDE
-BOOL handleSetDGOpModeBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+// MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION
+void handleTestBlockMessagesRequest( MESSAGE_T *message );
 
 /**@}*/