Index: MsgDefs.h
===================================================================
diff -u -r9be5729c705d51356f8883cbc00d23da256035c4 -rd291c26eeb65c683f069efdfdb51764015aecd04
--- MsgDefs.h	(.../MsgDefs.h)	(revision 9be5729c705d51356f8883cbc00d23da256035c4)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision d291c26eeb65c683f069efdfdb51764015aecd04)
@@ -206,11 +206,6 @@
     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 = 0xB1,                                           ///< TD battery status logging data
-    MSG_ID_TD_BATTERY_MANAGEMENT_DATA = 0xB2,                                       ///< TD battery management logging data
-    MSG_ID_TD_BATTERY_REMAINING_CAPACITY = 0xB3,                                    ///< TD battery remaining capacity in mAh
-    MSG_ID_TD_BATTERY_STATUS = 0xB4,                                                ///< TD battery pack status register (SMBus address 0x0B)
-    MSG_ID_TD_BATTERY_CHARGER_STATUS = 0xB5,                                        ///< TD battery charger status including charge cycle state and power good status (I2C address 0x6B).
 
     // service/test CAN messages
     MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000,                                        ///< First TD test message ID
@@ -286,6 +281,9 @@
     MSG_ID_TD_BLOOD_PRIME_VOLUME_OVERRIDE = 0x8045,                                 ///< TD blood prime override.
     MSG_ID_TD_BLOOD_PRIME_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8046,               ///< TD blood prime publish interval broadcast override.
     MSG_ID_TD_ENABLE_VENOUS_BUBBLE_ALARM = 0x8047,                                  ///< TD enable venous bubble alarm.
+    MSG_ID_TD_BATTERY_REMAINING_CAPACITY_OVERRIDE_REQUEST = 0x8048,                 ///< TD battery remaining capacity override.
+    MSG_ID_TD_BATTERY_STATUS_OVERRIDE_REQUEST = 0x8049,                             ///< TD battery pack status override.
+    MSG_ID_TD_BATTERY_CHARGER_STATUS_OVERRIDE_REQUEST = 0x804A,                     ///< TD battery charger status override.
 
     MSG_ID_FIRST_DD_TESTER_MESSAGE = 0xA000,                                            ///< First DD test message ID
     MSG_ID_DD_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DD_TESTER_MESSAGE,                    ///< DD tester log-in