Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -rf308cc4c35eab630ebbbde405cfe47d049afeafb
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision a7bf3ca23ea37a61000379facae628a31b3ecc59)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision f308cc4c35eab630ebbbde405cfe47d049afeafb)
@@ -7,8 +7,8 @@
 *
 * @file SystemCommMessages.h
 *
-* @author (last) Dara Navaei
-* @date (last) 10-Jun-2020
+* @author (last) Quang Nguyen
+* @date (last) 21-Jul-2020
 *
 * @author (original) Dara Navaei
 * @date (original) 05-Nov-2019
@@ -34,6 +34,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 +61,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 cpi, F32 cpo );
+
 // MSG_ID_POWER_OFF_WARNING
 void handlePowerOffWarning( MESSAGE_T *message );
 
@@ -82,20 +94,20 @@
 // 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 );
-
-// MSG_ID_TEMPERATURE_SENSORS_READINGS
-BOOL broadcastTemperatureSensorsData ( U08 *sensorsValue, U32 byteLength );
-
 // *********** public test support message functions **********
 
 #ifdef DEBUG_ENABLED
 // DEBUG OUTPUT
 BOOL sendDebugData( U08 *dbgData, U32 len );
+
+// Debug message to UI for logging
+void sendDebugDataToUI( U08 *str );
 #endif
 
 // MSG_TESTER_LOG_IN
@@ -154,14 +166,24 @@
 void handleTestValvesStatesPublishIntervalOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_DG_SAFETY_SHUTDOWN_OVERRIDE:
-void handleTestDGSafetyShutdownOverrideRequest( 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_START_STOP_PRIMARY_HEATER
-BOOL handleStartStopPrimaryHeater( MESSAGE_T * message );
-
-#ifdef CAN_TEST
-// MSG_ID_DG_CAN_TEST_1_LARGE_FREQ
-void broadcastCANTest1LargeFrequentMessage();
+// 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
-
-#endif