Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r7853a74cbecf3cac9e3544fad56351a589f203e0 -r2b60564ac818a6692b714dfd9920d2e2fcf0937d
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 7853a74cbecf3cac9e3544fad56351a589f203e0)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 2b60564ac818a6692b714dfd9920d2e2fcf0937d)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2021 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
+* @file    SystemComm.c
 *
-* @author (last) Quang Nguyen
-* @date (last) 26-Aug-2020
+* @author  (last)      Dara Navaei
+* @date    (last)      06-Nov-2021
 *
-* @author (original) Dara Navaei
-* @date (original) 05-Nov-2019
+* @author  (original)  Dara Navaei
+* @date    (original)  05-Nov-2019
 *
 ***************************************************************************/
 
@@ -950,7 +950,9 @@
                 U16 msgID;
 
                 memcpy( &msgID, &pendingAckList[ i ].msg[ sizeof( U08 ) + sizeof( U16) ], sizeof( U16 ) );
-                //SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CAN_MESSAGE_NOT_ACKED, (U32)msgID ); TODO uncomment this unit 2 raises this alarm no HD
+#ifndef DISABLE_ACK_ALARM
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CAN_MESSAGE_NOT_ACKED, (U32)msgID );
+#endif
                 pendingAckList[ i ].used = FALSE;  // take pending message off of list
             }
         }