Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r8074ecece0b11532c173ad951a98036f0c54ca52 -r1f1b53030a930c542646d9d88c7db0c3a945f150
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 8074ecece0b11532c173ad951a98036f0c54ca52)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 1f1b53030a930c542646d9d88c7db0c3a945f150)
@@ -7,8 +7,8 @@
 *
 * @file    SystemComm.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      12-Jul-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      08-Aug-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -888,6 +888,10 @@
             handleDGScheduledRunsRequest( message );
             break;
 
+        case MSG_ID_HD_REQUEST_DG_SERVICE_MODE:
+            handleServiceModeRequest( message );
+            break;
+
         case MSG_ID_HD_REQUEST_DG_USAGE_INFO:
             handleHDRequestDGUsageInfo( message );
             break;
@@ -1125,11 +1129,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:
@@ -1140,10 +1144,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;
@@ -1156,6 +1156,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;
@@ -1188,6 +1192,14 @@
                 handleSetDGUsageInfoRecord( message );
                 break;
 
+            case MSG_ID_DG_SET_OP_MODE_REQUEST:
+                handleTestSetOpModeRequest( message );
+                break;
+
+            case MSG_ID_DG_RESERVOIR_TARE_REQUEST:
+                handleTestTareReservoirRequest( message );
+                break;
+
             case MSG_ID_HD_REQUEST_DG_ALARMS:
                 handleResendAllAlarmsCommand( message );
                 break;