Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rfb1673d2282822995ed233f3e9ea5dfb0567780d -r3633c7c348e95b11175dfb4a4a183bdb6cd24478
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision fb1673d2282822995ed233f3e9ea5dfb0567780d)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 3633c7c348e95b11175dfb4a4a183bdb6cd24478)
@@ -7,8 +7,8 @@
 *
 * @file    SystemComm.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      03-Aug-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      07-Sep-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -1610,10 +1610,6 @@
                 handleTestSyringePumpHeprinBolusTargetRateOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_REQ_CURRENT_TREATMENT_PARAMETERS:
-                handleTestCurrentTreamtmentParametersRequest( message );
-                break;
-
             case MSG_ID_HD_FANS_DUTY_CYCLE_OVERRIDE:
                 handleSetFansDutyCycleOverrideRequest( message );
                 break;
@@ -1650,6 +1646,10 @@
                 handleResendAllAlarmsCommand( message );
                 break;
 
+            case MSG_ID_HD_REQ_CURRENT_TREATMENT_PARAMETERS:
+                handleTestCurrentTreamtmentParametersRequest( message );
+                break;
+
             // The default cannot be reached in VectorCAST since the cases are run in a for loop
             default:
                 // Unrecognized message ID received - ignore