Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r8e6488e189349e0f87f2fb21fa8176aced0b5a43 -rf308cc4c35eab630ebbbde405cfe47d049afeafb
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision f308cc4c35eab630ebbbde405cfe47d049afeafb)
@@ -7,8 +7,8 @@
 *
 * @file SystemComm.c
 *
-* @author (last) Dara Navaei
-* @date (last) 10-Jun-2020
+* @author (last) Quang Nguyen
+* @date (last) 03-Aug-2020
 *
 * @author (original) Dara Navaei
 * @date (original) 05-Nov-2019
@@ -1140,6 +1140,7 @@
 
             case MSG_ID_DG_SAFETY_SHUTDOWN_OVERRIDE:
                 handleTestDGSafetyShutdownOverrideRequest( message );
+                break;
 
             case MSG_ID_TEMPERATURE_SENSORS_VALUE_OVERRIDE:
                 handleTestTemperatureSensorsOverrideRequest ( message );
@@ -1151,8 +1152,16 @@
 
             case MSG_ID_HEATERS_PUBLISH_INTERVAL_ORVERRIDE:
                 handleTestHeatersDataPublishOverrideRequest ( message );
-                break;
+                break;
 
+            case MSG_ID_CONDUCTIVITY_OVERRIDE:
+                handleTestSetConductivityOverrideRequest ( message );
+                break;
+
+            case MSG_ID_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestSetConductivityDataPublishIntervalOverrideRequest ( message );
+                break;
+
             case MSG_ID_DG_ACCEL_OVERRIDE:
                 handleTestDGAccelOverrideRequest( message );
                 break;