Index: AlarmDefs.h
===================================================================
diff -u -r7238f72393ddb8dd8bf835d56382060067c45153 -rf5edfc40fa2c13c4d6b04c86d5e0443db6ac3242
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 7238f72393ddb8dd8bf835d56382060067c45153)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision f5edfc40fa2c13c4d6b04c86d5e0443db6ac3242)
@@ -229,6 +229,8 @@
     ALARM_ID_TD_ARTERIAL_PRESSURE_DECAY                             = 197,  ///< TD arterial pressure decay failure
     ALARM_ID_TD_ARTERIAL_PRESSURE_LEAK                              = 198,  ///< TD arterial pressure leak
     ALARM_ID_TD_ARTERIAL_PRESSURE_RELIEF                            = 199,  ///< TD arterial pressure relief failure
+    ALARM_ID_TD_BATTERY_PACK_ERROR_DETECTED                         = 200,  ///< TD battery pack detected an error
+    ALARM_ID_TD_BATTERY_COMM_FAULT                                  = 201,  ///< TD battery communication fault
     NUM_OF_ALARM_IDS                                                        ///< Number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                         ///< Type for alarm list enumeration
@@ -576,7 +578,10 @@
     { ALARM_PRIORITY_HIGH,    10,  ALM_SRC_TD, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_TD_SYRINGE_PUMP_PRIME_TIMEOUT                       },
     { 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
+    //   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                               },
+};
 
 /// Table of alarms and their rank.
 const ALARM_RANK_T ALARM_RANK_TABLE[] =
@@ -781,6 +786,8 @@
     { 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 -r7238f72393ddb8dd8bf835d56382060067c45153 -rf5edfc40fa2c13c4d6b04c86d5e0443db6ac3242
--- MsgDefs.h	(.../MsgDefs.h)	(revision 7238f72393ddb8dd8bf835d56382060067c45153)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision f5edfc40fa2c13c4d6b04c86d5e0443db6ac3242)
@@ -206,7 +206,10 @@
     MSG_ID_TD_TUBING_SET_BARCODE_SCAN_REQUEST = 0xAE,                               ///< TD tube set authentication request
     MSG_ID_TD_TUBE_SET_AUTHENTICATION_REQUEST = 0xAF,                               ///< UI tube set authentication acknowledge request
     MSG_ID_TD_TUBE_SET_AUTHENTICATION_ACK_RESPONSE = 0xB0,                          ///< TD tube set authentication acknowledge response
+    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