Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rd838fbaa8507b883fa112e69137e86fc9fb2cb6f -r2a88e9acf15658fb4ed6515c486a230cb4490452
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision d838fbaa8507b883fa112e69137e86fc9fb2cb6f)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 2a88e9acf15658fb4ed6515c486a230cb4490452)
@@ -1,20 +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 SystemComm.c
- *
- *  @date 08-Oct-2019
- *  @author S. Nash
- *
- *  @brief SystemComm service module.  Provides system message communication \n
- *  functionality.  Messages can be queued for transmission.  Incoming messages \n
- *  are processed.
- *
- **************************************************************************/
+/**************************************************************************
+*
+* 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 SystemComm.c
+*
+* @author (last) Quang Nguyen
+* @date (last) 23-Jul-2020
+*
+* @author (original) Dara Navaei
+* @date (original) 05-Nov-2019
+*
+***************************************************************************/
 
 #include <string.h>     // for memcpy()
 
@@ -533,12 +532,12 @@
             {
                 signalCANXmitsCompleted();
                 // TODO - shouldn't get here, but let's see if we do
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_SOFTWARE_FAULT, (U32)mBox )
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, (U32)mBox )
             }
         }
         else
         {   // TODO - shouldn't get here - just testing - set first data to new s/w fault enum later
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, (U32)buffer, (U32)dataSize )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, (U32)buffer, (U32)dataSize )
         }
     }
 
@@ -1070,7 +1069,7 @@
                 handleTestROPumpDataBroadcastIntervalOverrideRequest( message );
                 break;
 
-            case MSG_ID_DRAIN_PUMP_SET_PT_OVERRIDE:
+            case MSG_ID_DRAIN_PUMP_SET_RPM_OVERRIDE:
                 handleTestDrainPumpSetPointOverrideRequest( message );
                 break;
 
@@ -1088,6 +1087,7 @@
 
             case MSG_ID_DG_SAFETY_SHUTDOWN_OVERRIDE:
                 handleTestDGSafetyShutdownOverrideRequest( message );
+                break;
 
             case MSG_ID_TEMPERATURE_SENSORS_VALUE_OVERRIDE:
                 handleTestTemperatureSensorsOverrideRequest ( message );
@@ -1099,8 +1099,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;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;