Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r8e6488e189349e0f87f2fb21fa8176aced0b5a43 -rf308cc4c35eab630ebbbde405cfe47d049afeafb
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f308cc4c35eab630ebbbde405cfe47d049afeafb)
@@ -7,8 +7,8 @@
 *
 * @file SystemCommMessages.c
 *
-* @author (last) Sean Nash
-* @date (last) 29-Jun-2020
+* @author (last) Quang Nguyen
+* @date (last) 21-Jul-2020
 *
 * @author (original) Dara Navaei
 * @date (original) 05-Nov-2019
@@ -18,6 +18,7 @@
 #include <string.h>     // for memcpy()
 
 #include "Accel.h"
+#include "ConductivitySensors.h"
 #include "DrainPump.h"
 #include "FPGA.h"
 #include "Heaters.h"
@@ -647,6 +648,41 @@
 
     return result;
 }
+
+
+/*************************************************************************
+ * @brief
+ * The broadcastConductivityData function sends out conductivity data.
+ * @details
+ * Inputs : none
+ * Outputs : conductivity data msg constructed and queued
+ * @param cpi: water inlet conductivity data.
+ * @param cpo : water outlet conductivity data.
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastConductivityData( F32 cpi, F32 cpo )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+    CONDUCTIVITY_DATA_T payload;
+
+    // create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_DG_CONDUCTIVITY_DATA;
+    msg.hdr.payloadLen = sizeof( CONDUCTIVITY_DATA_T );
+
+    payload.cpi = cpi;
+    payload.cpo = cpo;
+
+    memcpy( payloadPtr, &payload, sizeof( CONDUCTIVITY_DATA_T ) );
+
+    // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
 
 // ***********************************************************************
 // **************** Message Handling Helper Functions ********************
@@ -1354,3 +1390,28 @@
     // respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
+
+/*************************************************************************
+ * @brief
+ * The handleTestSetConductivityOverrideRequest function handles a
+ * request to override a conductivity sensor's value
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+DATA_ARRAY_OVERRIDE_HANDLER_FUNC_F32( F32, handleTestSetConductivityOverrideRequest, testSetConductivityOverride, testResetConductivityOverride )
+
+/*************************************************************************
+* @brief
+* The handleTestSetConductivityDataPublishIntervalOverrideRequest function
+* handles a request to override the publish interval of conductivity sensors data
+* @details
+* Inputs : none
+* Outputs : message handled
+* @param message : a pointer to the message to handle
+* @return none
+*************************************************************************/
+DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestSetConductivityDataPublishIntervalOverrideRequest, \
+                                testSetConductivityDataPublishIntervalOverride, testResetConductivityDataPublishIntervalOverride )