Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r9279d01e7e539ad1e788b85db4ea2288965b03c6 -r23fd3843b6e50ff90b4db987be553c823bfd6597
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 9279d01e7e539ad1e788b85db4ea2288965b03c6)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 23fd3843b6e50ff90b4db987be553c823bfd6597)
@@ -8,7 +8,7 @@
 * @file    SystemComm.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      22-Feb-2022
+* @date    (last)      31-Mar-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -1153,6 +1153,14 @@
                 handleFansRPMOverride( message );
                 break;
 
+            case MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE:
+                handleTestUsedAcidVolumeMLOverrideRequest( message );
+                break;
+
+            case MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE:
+                handleTestUsedBicarbVolumeMLOverrideRequest( message );
+                break;
+
             case MSG_ID_DG_GET_SW_CONFIG_RECORD:
                 handleGetDGSoftwareConfigRecord( message );
                 break;
@@ -1169,14 +1177,6 @@
                 handleTestHDCommunicationStatusOverrideRequest( message );
                 break;
 
-            case MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE:
-                handleTestUsedAcidVolumeMLOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE:
-                handleTestUsedBicarbVolumeMLOverrideRequest( message );
-                break;
-
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;