Index: AlarmDefs.h
===================================================================
diff -u -rf5edfc40fa2c13c4d6b04c86d5e0443db6ac3242 -re5d0f71422a6206fecc299bb1dda0e48621d1946
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision f5edfc40fa2c13c4d6b04c86d5e0443db6ac3242)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision e5d0f71422a6206fecc299bb1dda0e48621d1946)
@@ -579,8 +579,8 @@
     { ALARM_PRIORITY_HIGH,   110,  ALM_SRC_FP, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_P9_COND_SENSOR_FPGA_FAULT                        },
     { ALARM_PRIORITY_HIGH,   110,  ALM_SRC_FP, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_P18_COND_SENSOR_FPGA_FAULT                       },
     //   Priority            Rank  Source      Fault DDFault Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  BlkRB  BlkET  NoBRcr NoDRcr AutoRes ClrOnly TxLog  ID
-    { ALARM_PRIORITY_HIGH,   110,  ALM_SRC_FP, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_TD_BATTERY_PACK_ERROR_DETECTED                      },
-    { ALARM_PRIORITY_HIGH,   110,  ALM_SRC_FP, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_TD_BATTERY_COMM_FAULT                               },
+    { ALARM_PRIORITY_HIGH,   110,  ALM_SRC_TD, FALSE, FALSE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_TD_BATTERY_PACK_ERROR_DETECTED                      },
+    { ALARM_PRIORITY_HIGH,   110,  ALM_SRC_TD, FALSE, FALSE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_TD_BATTERY_COMM_FAULT                               },
 };
 
 /// Table of alarms and their rank.
@@ -719,6 +719,8 @@
     { 110, ALARM_ID_FP_GEN_PERMEATE_TANK_FILL_TIMEOUT },
     { 110, ALARM_ID_TD_BAROMETRIC_SENSOR_COEFFS_BAD_CRC },
     { 110, ALARM_ID_TD_BARO_PRESSURE_OUT_OF_RANGE },
+    { 110, ALARM_ID_TD_BATTERY_COMM_FAULT },
+    { 110, ALARM_ID_TD_BATTERY_PACK_ERROR_DETECTED },
     { 111, ALARM_ID_TD_DD_COMM_TIMEOUT },
     { 111, ALARM_ID_TD_CAN_MESSAGE_NOT_ACKED_BY_DD },
     { 111, ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_FP },
@@ -786,8 +788,6 @@
     { 999, ALARM_ID_UI_RESERVED_129 },
     { 999, ALARM_ID_UI_RESERVED_130 },
     { 999, ALARM_ID_NO_ALARM },
-    { 999, ALARM_ID_TD_BATTERY_COMM_FAULT },
-    { 999, ALARM_ID_TD_BATTERY_PACK_ERROR_DETECTED },
 };
 
 #endif // included by AlarmMgmt.c
Index: MsgDefs.h
===================================================================
diff -u -rf5edfc40fa2c13c4d6b04c86d5e0443db6ac3242 -re5d0f71422a6206fecc299bb1dda0e48621d1946
--- MsgDefs.h	(.../MsgDefs.h)	(revision f5edfc40fa2c13c4d6b04c86d5e0443db6ac3242)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision e5d0f71422a6206fecc299bb1dda0e48621d1946)
@@ -209,7 +209,6 @@
     MSG_ID_TD_BATTERY_STATUS_DATA = 0xBF,                                           ///< TD battery status logging data
     MSG_ID_TD_BATTERY_MANAGEMENT_DATA = 0xBE,                                       ///< TD battery management logging data
 
-
     // service/test CAN messages
     MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000,                                        ///< First TD test message ID
     MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TD_TESTER_MESSAGE,                   ///< TD tester log-in