Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -re6c4c61c793a91f9ed9dfe969e01bdeee565347d -r608780a6e5449b5a9710ac07299ec028117c9f4d
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision e6c4c61c793a91f9ed9dfe969e01bdeee565347d)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 608780a6e5449b5a9710ac07299ec028117c9f4d)
@@ -894,12 +894,16 @@
             handleDGScheduledRunsRequest( 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_REQUEST_CPLD_STATUS:
+            handleCpldStatusRequest( message );
             break;
 
         // NOTE: This case must be last
@@ -1137,11 +1141,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 +1156,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 +1168,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;
@@ -1200,18 +1204,19 @@
                 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;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;