Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r2b6abbe347b2da260a4d46aca233bbfb6a59bf04 -rba0b07893eccc26bda5d46281980c2e8cb499997
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 2b6abbe347b2da260a4d46aca233bbfb6a59bf04)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision ba0b07893eccc26bda5d46281980c2e8cb499997)
@@ -8,7 +8,7 @@
 * @file    SystemComm.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      19-Oct-2022
+* @date    (last)      28-Oct-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -893,12 +893,17 @@
             handleDGSendConcentrateMixingRatios( message );
             break;
 
+
+        case MSG_ID_HD_REQUEST_DG_SERVICE_MODE:
+            handleServiceModeRequest( message );
+            break;
+
         case MSG_ID_HD_REQUEST_DG_USAGE_INFO:
             handleHDRequestDGUsageInfo( message );
             break;
 
-        case MSG_ID_HD_REQUEST_DG_SERVICE_MODE:
-            handleServiceModeRequest( message );
+        case MSG_ID_DG_CPLD_STATUS:
+            handleCpldStatusRequest( message );
             break;
 
         // NOTE: This case must be last
@@ -1068,6 +1073,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;
@@ -1125,11 +1134,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 +1149,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 +1161,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;
@@ -1192,18 +1201,31 @@
                 handleSetDGUsageInfoRecord( message );
                 break;
 
-            case MSG_ID_HD_REQUEST_DG_ALARMS:
-                handleResendAllAlarmsCommand( 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;
+
+            case MSG_ID_DG_GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestGenIdlePublishIntervalOverride( 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;