Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r22176ce95e49213c48454f34ddf5d29b8109f2cb -r3b70632c04247a6973960e1f37ae73eb4384a6b7
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 22176ce95e49213c48454f34ddf5d29b8109f2cb)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 3b70632c04247a6973960e1f37ae73eb4384a6b7)
@@ -7,8 +7,8 @@
 *
 * @file    SystemComm.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      23-May-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      08-Aug-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -655,7 +655,6 @@
     if ( TRUE == didTimeout( timeOfLastHDCheckIn, HD_COMM_TIMEOUT_IN_MS ) )
     {
         hdCommunicationStatus.data = FALSE;
-        activateAlarmNoData( ALARM_ID_HD_COMM_TIMEOUT );
     }
 }
 
@@ -837,6 +836,10 @@
             handleDrainCmd( message );
             break;
 
+        case MSG_ID_HD_OP_MODE:
+            handleSetHDOperationMode( message );
+            break;
+
         case MSG_ID_STARTING_STOPPING_TREATMENT_CMD:
             handleStartStopTreatmentMsg( message );
             break;
@@ -881,6 +884,10 @@
             handleDGScheduledRunsRequest( message );
             break;
 
+        case MSG_ID_HD_REQUEST_DG_SERVICE_MODE:
+            handleServiceModeRequest( message );
+            break;
+
         // NOTE: This case must be last
         case MSG_ID_DG_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
@@ -1185,10 +1192,14 @@
                 handleSetDGUsageInfoRecord( message );
                 break;
 
-            case MSG_ID_HD_OP_MODE:
-                handleSetHDOperationMode( message );
+            case MSG_ID_DG_SET_OP_MODE_REQUEST:
+                handleTestSetOpModeRequest( message );
                 break;
 
+            case MSG_ID_DG_RESERVOIR_TARE_REQUEST:
+                handleTestTareReservoirRequest( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;