Index: SystemComm.c
===================================================================
diff -u -rfc0b755338e1ccd0cabe1965daf4ce2bd78c92e7 -ra63f636c18858c8444d3e4908bb19755b4f2be27
--- SystemComm.c	(.../SystemComm.c)	(revision fc0b755338e1ccd0cabe1965daf4ce2bd78c92e7)
+++ SystemComm.c	(.../SystemComm.c)	(revision a63f636c18858c8444d3e4908bb19755b4f2be27)
@@ -234,7 +234,7 @@
     else
     {
         // Should not get here - not an active message box
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX, srcCANBox )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX, srcCANBox )
     }
 }
 
@@ -359,12 +359,12 @@
             else
             {
                 signalCANXmitsCompleted();
-//                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_CMMM_CAN_TRANSMIT_REJECTED, (U32)mBox )
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_CMMM_CAN_TRANSMIT_REJECTED, (U32)mBox )
             }
         }
         else
         {
-//            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_COMM_INVALID_FRAME_SIZE, ((U32)buffer << 16) | dataSize )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_COMM_INVALID_FRAME_SIZE, ((U32)buffer << 16) | dataSize )
         }
     }
 
@@ -608,7 +608,7 @@
 {
     if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_BAD_MSG_CRC ) )
     {
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS, (U32)ALARM_SOURCE_HD );
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_COMM_TOO_MANY_BAD_CRCS, (U32)ALARM_SOURCE_HD );
     }
 }
 
@@ -724,11 +724,11 @@
 
                 if ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_TD_2_DD )
                 {
-//                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_BY_UI, (U32)msgID );
+                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_CAN_MESSAGE_NOT_ACKED_BY_UI, (U32)msgID );
                 }
                 else
                 {
-//                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_BY_DD, (U32)msgID );
+                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_CAN_MESSAGE_NOT_ACKED_BY_DD, (U32)msgID );
                 }
                 pendingAckList[ i ].used = FALSE;  // Take pending message off of list
             }