Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r0ddfb88172db9b6c0b41b1dc5c0cc3e0296068be -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 0ddfb88172db9b6c0b41b1dc5c0cc3e0296068be)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 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)      Sean Nash
-* @date    (last)      12-Nov-2021
+* @author  (last)      Hung Nguyen
+* @date    (last)      04-Jan-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -26,6 +26,8 @@
 #include "OperationModes.h"
 #include "SystemComm.h"
 #include "SystemCommMessages.h"
+#include "Interrupts.h"
+#include "OperationModes.h"
 #include "Timers.h"
 #include "Utilities.h"
 
@@ -50,13 +52,14 @@
 #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
 
 #pragma pack(push, 1)
 
-/// Record for transmitted message that is pending acknowledgement from receiver.
+/// Record for transmitted message that is pending acknowledgment from receiver.
 typedef struct
 {
     BOOL used;