Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r6ba61903be56ce79582fc9a31e0927df4dafee08 -reb57e092118ff2f79ba7cb48c551bacd01ad8aef
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6ba61903be56ce79582fc9a31e0927df4dafee08)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision eb57e092118ff2f79ba7cb48c551bacd01ad8aef)
@@ -8,7 +8,7 @@
 * @file    SystemComm.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      19-Oct-2022
+* @date    (last)      21-Dec-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -877,6 +877,10 @@
             handleStartStopDGChemicalDisinfect( message );
             break;
 
+        case MSG_ID_DG_START_STOP_CHEM_DISINFECT_FLUSH:
+            handleStartStopDGChemicalDisinfectFlush( message );
+            break;
+
         case MSG_ID_UI_DG_SET_RTC_REQUEST:
             handleUIClockSyncRequest( message );
             break;
@@ -901,6 +905,22 @@
             handleServiceModeRequest( message );
             break;
 
+        case MSG_ID_DG_SET_SERVICE_TIME:
+            handleSetDGServiceTime( message );
+            break;
+
+        case MSG_ID_DG_START_STOP_HEAT_DISINFECT_ACTIVE_COOL:
+            handleStartStopDGHeatDisinfectActiveCool( message );
+            break;
+
+        case MSG_ID_REQUEST_CPLD_STATUS:
+            handleCpldStatusRequest( 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 );
@@ -1068,6 +1088,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;
@@ -1192,10 +1216,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;
@@ -1212,6 +1232,38 @@
                 handleTestGenIdlePublishIntervalOverride( message );
                 break;
 
+            case MSG_ID_DG_DRAIN_PUMP_DIRECTION_OVERRIDE:
+                handleTestDGDrainPumpDirectionOverrideRequest( message );
+                break;
+
+            case MSG_ID_DG_CONC_PUMP_PARK_STATUS_OVERRIDE:
+                handleTestDGConcPumpParkStatusOverrideRequest( message );
+                break;
+
+            case MSG_ID_DG_CONC_PUMP_PARK_FAULT_STATUS_OVERRIDE:
+                handleTestDGConcPumpParkFaultStatusOverrideRequest( message );
+                break;
+
+            case MSG_ID_DG_CONC_PUMP_PARK_COMMAND:
+                handleTestDGConcPumpParkCommandRequest( message );
+                break;
+
+            case MSG_ID_DG_NV_RECORD_CRC_OVERRIDE:
+                handleTestDGNVRecordCRCOverride( 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;