Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r740929e7f04220e1a74e1a6f8ce71129f40a7be1 -r5e8f96e11c797bddeddfc009c87f20df3b7a8664
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 740929e7f04220e1a74e1a6f8ce71129f40a7be1)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 5e8f96e11c797bddeddfc009c87f20df3b7a8664)
@@ -7,8 +7,8 @@
 *
 * @file    SystemComm.c
 *
-* @author  (last)      Dong Nguyen
-* @date    (last)      27-Sep-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      21-Nov-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -857,8 +857,12 @@
             handleSampleWaterCmd( message );
             break;
 
+        case MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD:
+            handleHDStartStopTrimmerHeaterCmd( message );
+            break;
+
         case MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD:
-            handleStartStopTrimmerHeaterCmd( message );
+            handleDGStartStopTrimmerHeater( message );
             break;
 
         case MSG_ID_DG_START_STOP_FLUSH:
@@ -897,6 +901,10 @@
             handleServiceModeRequest( message );
             break;
 
+        case MSG_ID_HD_REQUEST_DG_ALARMS:
+            handleResendAllAlarmsCommand( message );
+            break;
+
         // NOTE: This case must be last
         case MSG_ID_DG_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
@@ -1064,6 +1072,10 @@
                 handleTestROPumpDutyCycleOverride( message );
                 break;
 
+            case MSG_ID_DG_VALVES_SENSED_STATE_OVERRIDE:
+                handleTestDGValvesSensedStateOverrideRequest( message );
+                break;
+
             case MSG_ID_DG_SET_RO_PUMP_TARGET_FLOW:
                 handleTestROPumpTargetFlowOverride( message );
                 break;
@@ -1188,10 +1200,6 @@
                 handleSetDGUsageInfoRecord( message );
                 break;
 
-            case MSG_ID_HD_REQUEST_DG_ALARMS:
-                handleResendAllAlarmsCommand( message );
-                break;
-
             case MSG_ID_DG_SET_OP_MODE_REQUEST:
                 handleTestSetOpModeRequest( message );
                 break;
@@ -1200,6 +1208,26 @@
                 handleTestTareReservoirRequest( message );
                 break;
 
+            case MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE:
+                handleTestDGDrainPumpCurrentOverrideRequest( message );
+                break;
+
+            case MSG_ID_DG_DRAIN_PUMP_DIRECTION_OVERRIDE:
+                handleTestDGDrainPumpDirectionOverrideRequest( message );
+                break;
+
+            case MSG_ID_DG_RO_FEEDBACK_VOLTAGE_OVERRIDE:
+                handleTestDGROPumpFeedbackVoltageOverrideRequest( message );
+                break;
+
+            case MSG_ID_DG_DIALYSATE_FILL_INTEGRATED_VOLUME_OVERRIDE:
+                handleTestDGFillIntegratedVolumeOverrideRequest( message );
+                break;
+
+            case MSG_ID_FILL_MODE_DATA_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestDGFillModeBroadcastOverrideRequest( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;