Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rd4481dd44bcc98172e785f812aa0c543c5385252 -rf308cc4c35eab630ebbbde405cfe47d049afeafb
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision d4481dd44bcc98172e785f812aa0c543c5385252)
+++ 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
@@ -62,11 +62,14 @@
 BOOL broadcastReservoirData( U32 resID, U32 fillToVol, U32 drainToVol );
 
 // MSG_ID_HEATERS_READINGS
-BOOL broadcastHeatersData( U32 mainPrimaryDC, U32 smallPrimaryDC, U32 trimmerDC );
+BOOL broadcastHeatersData ( U32 mainPrimaryDC, U32 smallPrimaryDC, U32 trimmerDC );
 
 // MSG_ID_TEMPERATURE_SENSORS_READINGS
-BOOL broadcastTemperatureSensorsData( U08 *sensorsValue, U32 byteLength );
+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 );
 
@@ -163,7 +166,13 @@
 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_DG_ACCEL_OVERRIDE:
 void handleTestDGAccelOverrideRequest( MESSAGE_T *message );