Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r27a68f930508638f2eb6265ebb381c8918cbc37b -rc5f3dfc2a87c35036f21f969f6e762ae779839f2
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 27a68f930508638f2eb6265ebb381c8918cbc37b)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision c5f3dfc2a87c35036f21f969f6e762ae779839f2)
@@ -52,8 +52,7 @@
 #define MAX_COMM_CRC_FAILURE_WINDOW_MS  (10 * SEC_PER_MIN * MS_PER_SECOND)  ///< CRC error window
 
 #define MSG_NOT_ACKED_TIMEOUT_MS        150     ///< Maximum time for a Denali message that requires ACK to be ACK'd
-
-#define MSG_NOT_ACKED_TIMEOUT_MS_INIT   5000    ///< Maximum time for a Denali message that requires ACK to be ACK'd on the INIT state for the first (UI version request) message of the POST
+#define MSG_NOT_ACKED_TIMEOUT_MS_INIT   5000    ///< Maximum time for a Denali message that requires ACK to be ACK'd on the INIT state for the first (UI version request) message of the POST
 #define MSG_NOT_ACKED_MAX_RETRIES       3       ///< Maximum number of times a message that requires ACK that was not ACK'd can be re-sent before alarm
 #define PENDING_ACK_LIST_SIZE           25      ///< Maximum number of Denali messages that can be pending ACK at any given time
 
@@ -1618,10 +1617,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;
@@ -1634,6 +1629,10 @@
                 handleSetHDSoftwareConfigRecord( message );
                 break;
 
+            case MSG_ID_HD_REQ_CURRENT_TREATMENT_PARAMETERS:
+                handleTestCurrentTreamtmentParametersRequest( message );
+                break;
+
             default:
                 // Unrecognized message ID received - ignore
                 break;