Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r7bd4510581254bc4e7292159c630a95b6ab4b368 -r237bd674ddef86d5137221163e74162cd12e4fb9
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 7bd4510581254bc4e7292159c630a95b6ab4b368)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 237bd674ddef86d5137221163e74162cd12e4fb9)
@@ -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
@@ -819,6 +819,10 @@
             handleAlarmClear( message );
             break;
 
+        case MSG_ID_RTC_EPOCH:
+            handleRTCSyncFromHD( message );
+            break;
+
         case MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS:
             handleSetDialysateTemperatureCmd( message );
             break;
@@ -880,7 +884,7 @@
             handleDGPOSTResultRequest( message );
             break;
 
-        case MSG_ID_UI_REQUEST_SERVICE_INFO:
+        case MSG_ID_HD_REQUEST_DG_SERVICE_RECORD:
             handleDGServiceScheduleRequest( message );
             break;
 
@@ -892,6 +896,14 @@
             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;
+
         // NOTE: This case must be last
         case MSG_ID_DG_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
@@ -940,20 +952,16 @@
                 handleTestPressureDataBroadcastIntervalOverrideRequest( message );
                 break;
 
-            case MSG_ID_RO_MEASURED_FLOW_OVERRIDE:
-                handleTestROMeasuredFlowOverrideRequest( message );
+            case MSG_ID_MEASURED_FLOW_SENSORS_OVERRIDE:
+                handleTestMeasuredFlowOverrideRequest( message );
                 break;
 
-            case MSG_ID_DIALYSATE_MEASURED_FLOW_OVERRIDE:
-                handleTestDialysateMeasuredFlowOverrideRequest( message );
-                break;
-
             case MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE:
                 handleTestROPumpDataBroadcastIntervalOverrideRequest( message );
                 break;
 
-            case MSG_ID_DIALYSATE_FLOW_SEND_INTERVAL_OVERRIDE:
-                handleTestDialysateFlowDataBroadcastIntervalOverrideRequest( message );
+            case MSG_ID_FLOW_DATA_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestFlowSensorsDataBroadcastIntervalOverrideRequest( message );
                 break;
 
             case MSG_ID_DRAIN_PUMP_SET_RPM:
@@ -1064,10 +1072,6 @@
                 handleTestROPumpDutyCycleOverride( message );
                 break;
 
-            case MSG_ID_DG_RO_FLOW_RATE_OVERRIDE:
-                handleTestROMeasuredFlowOverrideRequest( message );
-                break;
-
             case MSG_ID_DG_SET_RO_PUMP_TARGET_FLOW:
                 handleTestROPumpTargetFlowOverride( message );
                 break;
@@ -1133,11 +1137,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:
@@ -1148,10 +1152,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;
@@ -1164,6 +1164,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;
@@ -1196,6 +1200,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;