Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rc7ea3969643ead419cbfcd34c3cb203c45bcad71 -rd4f40c48a728c866c24bf44a59ff8ddd1e244ca1
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision c7ea3969643ead419cbfcd34c3cb203c45bcad71)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision d4f40c48a728c866c24bf44a59ff8ddd1e244ca1)
@@ -1173,11 +1173,11 @@
                 break;
 
             case MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE:
-                handleFilterFlushTimePeriodOverride( message );
+                handleFilterFlushTimePeriodOverride(message);
                 break;
 
-            case MSG_ID_DG_FANS_RPM_OVERRIDE:
-                handleFansRPMOverride( message );
+            case MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION:
+                handleTestBlockMessagesRequest( message );
                 break;
 
             case MSG_ID_DG_STOP_RTC_CLOCK:
@@ -1188,10 +1188,6 @@
                 handleSetDrainPumpMeasuredRPMOverrideRequest( message );
                 break;
 
-            case MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION:
-                handleTestBlockMessagesRequest( message );
-                break;
-
             case MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD:
                 handleTestSuperClearAlarmsRequest( message );
                 break;
@@ -1204,6 +1200,10 @@
                 handleTestFansRPMAlarmStartTimeOffsetRequest( message );
                 break;
 
+            case MSG_ID_DG_FANS_RPM_OVERRIDE:
+                handleFansRPMOverride( message );
+                break;
+
             case MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE:
                 handleTestUsedAcidVolumeMLOverrideRequest( message );
                 break;
@@ -1248,14 +1248,14 @@
                 handleTestTareReservoirRequest( message );
                 break;
 
-            case MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE:
-                handleTestDrainPumpMeasuredCurrentOverride( message );
-                break;
-
             case MSG_ID_DG_GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE:
                 handleTestGenIdlePublishIntervalOverride( message );
                 break;
 
+            case MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE:
+                handleSetDrainPumpMeasuredRPMOverrideRequest( message );
+                break;
+
             case MSG_ID_DG_DRAIN_PUMP_DIRECTION_OVERRIDE:
                 handleTestDGDrainPumpDirectionOverrideRequest( message );
                 break;
@@ -1326,6 +1326,18 @@
                 handleTestDGDialinCheckIn( message );
                 break;
 
+            case MSG_ID_DG_GET_LOAD_CELLS_TARE_VALUES:
+                handleTestDGGetLoadCellsTareValues( message );
+                break;
+
+            case MSG_ID_DG_SET_LOAD_CELLS_TARE_VALUES:
+                handleTestDGSetLoadCellsTareValues( message );
+                break;
+
+            case MSG_ID_DG_SET_COND_SENSOR_CAL_TABLE:
+                handleTestDGSetConductivitySensorCalTable( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;