Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rd838fbaa8507b883fa112e69137e86fc9fb2cb6f -r0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision d838fbaa8507b883fa112e69137e86fc9fb2cb6f)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f)
@@ -1,18 +1,19 @@
-/**************************************************************************
- *
- *  Copyright (c) 2019-2020 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
- *
- *  @date 10-Oct-2019
- *  @author S. Nash
- *
- *  @brief header file for System Communication message definitions and functions.
- *
- **************************************************************************/
+/**************************************************************************
+*
+* Copyright (c) 2019-2020 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) 21-Jul-2020
+*
+* @author (original) Dara Navaei
+* @date (original) 05-Nov-2019
+*
+***************************************************************************/
 
 #ifndef __SYSTEM_COMM_MESSAGES_H__
 #define __SYSTEM_COMM_MESSAGES_H__
@@ -88,7 +89,10 @@
 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 );
 
 // *********** public test support message functions **********
 
@@ -153,7 +157,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_START_STOP_PRIMARY_HEATER
 BOOL handleStartStopPrimaryHeater( MESSAGE_T * message );