Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r44cc25461e4936f7928904640c87a03ef7cf3c16 -rab304e2ca6e3e40ed8cb12650e9855ae0b9649d8
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 44cc25461e4936f7928904640c87a03ef7cf3c16)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision ab304e2ca6e3e40ed8cb12650e9855ae0b9649d8)
@@ -7,8 +7,8 @@
 *
 * @file SystemCommMessages.h
 *
-* @author (last) Dara Navaei
-* @date (last) 10-Jun-2020
+* @author (last) Quang Nguyen
+* @date (last) 24-Aug-2020
 *
 * @author (original) Dara Navaei
 * @date (original) 05-Nov-2019
@@ -20,6 +20,14 @@
 
 #include "DGCommon.h"
 #include "MsgQueues.h"
+
+/**
+ *  @defgroup SystemCommMessages SystemCommMessages
+ *  @brief System communication messages service module. Handles and broadcasts system messages.
+ *
+ *  @addtogroup SystemCommMessages
+ *  @{
+ */
 
 // ********** public definitions **********
 
@@ -34,6 +42,9 @@
 // MSG_ID_ALARM_CLEARED
 BOOL broadcastAlarmCleared( U16 alarm );
 
+// MSG_ID_DG_ACCELEROMETER_DATA
+BOOL broadcastAccelData( F32 x, F32 y, F32 z, F32 xm, F32 ym, F32 zm, F32 xt, F32 yt, F32 zt );
+
 // MSG_ID_RTC_EPOCH
 BOOL broadcastRTCEpoch( U32 epoch );  // TODO - probably don't want DG to broadcast these
 
@@ -58,6 +69,15 @@
 // MSG_ID_DG_RESERVOIR_DATA
 BOOL broadcastReservoirData( U32 resID, U32 fillToVol, U32 drainToVol );
 
+// MSG_ID_HEATERS_READINGS
+BOOL broadcastHeatersData ( U32 mainPrimaryDC, U32 smallPrimaryDC, U32 trimmerDC );
+
+// MSG_ID_TEMPERATURE_SENSORS_READINGS
+BOOL broadcastTemperatureSensorsData ( U08 *sensorsValue, U32 byteLength );
+
+// MSG_ID_DG_CONDUCTIVITY_DATA
+BOOL broadcastConductivityData( F32 roRejectionRatio, F32 cpi, F32 cpo );
+
 // MSG_ID_POWER_OFF_WARNING
 void handlePowerOffWarning( MESSAGE_T *message );
 
@@ -82,9 +102,12 @@
 // MSG_ID_DG_SAMPLE_WATER_CMD
 void handleSampleWaterCmd( MESSAGE_T *message );
 
+// MSG_ID_START_STOP_PRIMARY_HEATER
+BOOL handleStartStopPrimaryHeater( MESSAGE_T * message );
+
 // MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD
 void handleStartStopTrimmerHeaterCmd( MESSAGE_T *message );
-
+
 // MSG_ID_HEATERS_READINGS
 BOOL broadcastHeatersData ( U32 mainPrimaryDC, U32 smallPrimaryDC, U32 trimmerDC );
 
@@ -93,7 +116,7 @@
 
 //MSG_ID_DG_HEAT_DISINFECT_DATA
 BOOL broadcastHeatDisinfectData( U32 internalState, F32 minutesElapsed, U32 currentCycle );
-
+
 // *********** public test support message functions **********
 
 #ifdef DEBUG_ENABLED
@@ -188,5 +211,27 @@
 
 //MSG_ID_HEAT_DISINFECT_PUBLISH_INTERVAL_OVERRIDE
 void handleSetHeatDisinfectionPublishDataIntervalOverrideRequest( MESSAGE_T *message );
+
+void handleTestDGSafetyShutdownOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_CONDUCTIVITY_OVERRIDE
+void handleTestSetConductivityOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE
+void handleTestSetConductivityDataPublishIntervalOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_DG_ACCEL_OVERRIDE:
+void handleTestDGAccelOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_ACCEL_MAX_OVERRIDE:
+void handleTestDGAccelMaxOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_ACCEL_SEND_INTERVAL_OVERRIDE:
+void handleTestDGAccelBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_ACCEL_SET_CALIBRATION:
+void handleSetAccelCalibration( MESSAGE_T *message );
+
+/**@}*/
+
 #endif