Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -re8053e6bdafd0638102e01c4250dfd74c0850ba1 -r4c20c78459041883eb73acf414cc6c42ed6e7821
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision e8053e6bdafd0638102e01c4250dfd74c0850ba1)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 4c20c78459041883eb73acf414cc6c42ed6e7821)
@@ -900,7 +900,7 @@
                 U16 msgID;
 
                 memcpy( &msgID, (U08*)&pendingAckList[ i ].msg[ sizeof( U08 ) + sizeof( U16) ], sizeof( U16 ) );
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CAN_MESSAGE_NOT_ACKED, (U32)msgID );
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED, (U32)msgID );
                 pendingAckList[ i ].used = FALSE;  // Take pending message off of list
             }
         }
Index: firmware/checkAlarms.sh
===================================================================
diff -u -r3d72b777cf1ceb673d118341c46e2d6d5b7b75f5 -r4c20c78459041883eb73acf414cc6c42ed6e7821
--- firmware/checkAlarms.sh	(.../checkAlarms.sh)	(revision 3d72b777cf1ceb673d118341c46e2d6d5b7b75f5)
+++ firmware/checkAlarms.sh	(.../checkAlarms.sh)	(revision 4c20c78459041883eb73acf414cc6c42ed6e7821)
@@ -21,11 +21,15 @@
 alarmRankLineNo=$(grep -n "ALARM_RANK_TABLE" ../Common/AlarmDefs.h)
 alarmRankLineNo=${alarmRankLineNo%%:*}
 
+alarmManualLineNo=$(grep -n "ALARM_MANUAL_TABLE" ../Common/AlarmDefs.h)
+alarmManualLineNo=${alarmManualLineNo%%:*}
+
 echo "
 #include <stdio.h>
 #include <stdlib.h>
 
 #define __ALARM_MGMT_C__
+#define __MANUAL_ALARMS__
 #include \"Common.h\"
 #include \"AlarmDefs.h\"
 
@@ -34,6 +38,7 @@
     ALARM_ID_T alarm;
     U32 lineNumber = $lineno;
     U32 alarmRankLineNumber = $alarmRankLineNo;
+    U32 alarmManualLineNumber = $alarmManualLineNo;
     U32 index;
 
     for ( alarm = ALARM_ID_NO_ALARM; alarm < NUM_OF_ALARM_IDS; alarm++ )
@@ -66,6 +71,17 @@
         }
     }
 
+    for ( alarm = ALARM_ID_NO_ALARM; alarm < NUM_OF_ALARM_IDS; alarm++ )
+    {
+        if ( alarm != ALARM_MANUAL_TABLE[ alarm ].alarmID )
+        {
+	    // The current alarm number is the starting line number of the ALARM_MANUAL_TABLE + 2 since the alarms enum start from 0
+            alarmManualLineNumber += alarm + 2;
+            printf(\"\\\"AlarmDefs.h\\\", line %d: error #9999: Alarm %i NOT MATCH Alarm Table ID %i!\n\", alarmManualLineNumber, alarm, ALARM_TABLE[ alarm ].alarmID);
+            exit(1);
+        }
+    }
+
     printf(\"Alarm rank table check completed!\n\");
 }" > alarmCheck.c