Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r4b9ae4e44d44ee6577fec4c8b75aa160fea04cc7 -r2c08db070a6e09306caf461e7aceeb53097fd995
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 4b9ae4e44d44ee6577fec4c8b75aa160fea04cc7)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 2c08db070a6e09306caf461e7aceeb53097fd995)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2023 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    SystemComm.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      21-Dec-2022
+* @date    (last)      02-Jan-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -897,14 +897,15 @@
             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_HD_REQUEST_DG_USAGE_INFO:
+            handleHDRequestDGUsageInfo( message );
+            break;
+
         case MSG_ID_DG_SET_SERVICE_TIME:
             handleSetDGServiceTime( message );
             break;
@@ -1149,11 +1150,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:
@@ -1164,10 +1165,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;
@@ -1180,6 +1177,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;
@@ -1224,6 +1225,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;