Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rd3926e5817813a9588b77f6c382940176a5feedc -r4b25bf00656b9067a13541014fa1333386a7ed95
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision d3926e5817813a9588b77f6c382940176a5feedc)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 4b25bf00656b9067a13541014fa1333386a7ed95)
@@ -893,15 +893,16 @@
             handleDGSendConcentrateMixingRatios( message );
             break;
 
-        case MSG_ID_HD_REQUEST_DG_USAGE_INFO:
-            handleHDRequestDGUsageInfo( message );
-            break;
 
         case MSG_ID_HD_REQUEST_DG_SERVICE_MODE:
             handleServiceModeRequest( message );
             break;
 
-        case MSG_ID_REQUEST_CPLD_STATUS:
+        case MSG_ID_HD_REQUEST_DG_USAGE_INFO:
+            handleHDRequestDGUsageInfo( message );
+            break;
+
+        case MSG_ID_DG_CPLD_STATUS:
             handleCpldStatusRequest( message );
             break;
 
@@ -1137,11 +1138,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:
@@ -1152,10 +1153,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;
@@ -1168,6 +1165,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;
@@ -1212,6 +1213,10 @@
                 handleTestTareReservoirRequest( 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;