Index: tools/Code_Report.csv
===================================================================
diff -u -r26c5a3b4e6110253b83199bfb93882178bdc5edd -r79a456785d0b4505d420d4290af9907c6c80d186
--- tools/Code_Report.csv	(.../Code_Report.csv)	(revision 26c5a3b4e6110253b83199bfb93882178bdc5edd)
+++ tools/Code_Report.csv	(.../Code_Report.csv)	(revision 79a456785d0b4505d420d4290af9907c6c80d186)
@@ -266,8 +266,10 @@
 ./hd/alarms.py, Function, cmd_alarm_audio_current_hg_override(self, current: float = 0.0, reset: int = NO_RESET):
 ./hd/alarms.py, Function, cmd_alarm_audio_current_lg_override(self, current: float = 0.0, reset: int = NO_RESET):
 ./hd/alarms.py, Function, cmd_alarm_backup_audio_current_override(self, current: float = 0.0, reset: int = NO_RESET):
-./hd/battery.py, Function, get_battery_percentage_remaining(self):
-./hd/battery.py, Function, cmd_battery_percentage_remaining_override(self, percentage: int, reset: int = NO_RESET) -> int:
+./hd/battery.py, Function, get_battery_status_values(self):
+./hd/battery.py, Function, get_battery_remaining_capacity(self):
+./hd/battery.py, Function, get_battery_manager_values(self):
+./hd/battery.py, Function, cmd_battery_remaining_capacity_override(self, mWh: float, reset: int = NO_RESET) -> int:
 ./hd/blood_flow.py, Function, get_pwm_duty_cycle_pct(self):
 ./hd/blood_flow.py, Function, get_rotor_count(self):
 ./hd/blood_flow.py, Function, cmd_blood_flow_set_point_override(self, flow: int, mode: int = PUMP_CONTROL_MODE_CLOSED_LOOP,
@@ -830,7 +832,40 @@
 hd/alarms.py, Variable, alarm_audio_curr_lg
 hd/alarms.py, Variable, alarm_backup_audio_curr
 hd/alarms.py, Variable, safety_shutdown_active
-hd/battery.py, Variable, battery_percentage
+hd/battery.py, Variable, RemainingCapacity
+hd/battery.py, Variable, BatteryStatus
+hd/battery.py, Variable, BatteryChargerStatus
+hd/battery.py, Variable, RemainingCapacityAlarm
+hd/battery.py, Variable, RemainingTimeAlarm
+hd/battery.py, Variable, BatteryMode
+hd/battery.py, Variable, AtRate
+hd/battery.py, Variable, AtRateTimeToFull
+hd/battery.py, Variable, AtRateTimeToEmpty
+hd/battery.py, Variable, AtRateOK
+hd/battery.py, Variable, Temperature
+hd/battery.py, Variable, Voltage
+hd/battery.py, Variable, Current
+hd/battery.py, Variable, AverageCurrent
+hd/battery.py, Variable, MaxError
+hd/battery.py, Variable, RelativeStateOfCharge
+hd/battery.py, Variable, AbsoluteStateOfCharge
+hd/battery.py, Variable, FullChargeCapacity
+hd/battery.py, Variable, RunTimeToEmpty
+hd/battery.py, Variable, AverageTimeToEmpty
+hd/battery.py, Variable, AverageTimeToFull
+hd/battery.py, Variable, ChargingCurrent
+hd/battery.py, Variable, ChargingVoltage
+hd/battery.py, Variable, CycleCount
+hd/battery.py, Variable, DesignCapacity
+hd/battery.py, Variable, DesignVoltage
+hd/battery.py, Variable, SpecificationInfo
+hd/battery.py, Variable, ManufactureDate
+hd/battery.py, Variable, SerialNumber
+hd/battery.py, Variable, ManufacturerName
+hd/battery.py, Variable, DeviceName
+hd/battery.py, Variable, DeviceChemistry
+hd/battery.py, Variable, status_values
+hd/battery.py, Variable, manager_values
 hd/blood_flow.py, Variable, target_blood_flow_rate
 hd/blood_flow.py, Variable, measured_blood_flow_rate
 hd/blood_flow.py, Variable, measured_blood_pump_rotor_speed
@@ -883,6 +918,7 @@
 hd/hemodialysis_device.py, Variable, air_pump
 hd/hemodialysis_device.py, Variable, air_trap
 hd/hemodialysis_device.py, Variable, alarms
+hd/hemodialysis_device.py, Variable, battery
 hd/hemodialysis_device.py, Variable, blood_leak
 hd/hemodialysis_device.py, Variable, bloodflow
 hd/hemodialysis_device.py, Variable, buttons
@@ -2077,10 +2113,13 @@
 common/msg_ids.py, Enum, MsgIds, MSG_ID_HD_REQUEST_DG_SERVICE_MODE
 common/msg_ids.py, Enum, MsgIds, MSG_ID_DG_RTC_EPOCH
 common/msg_ids.py, Enum, MsgIds, MSG_ID_HD_REQUEST_DG_USAGE_INFO
+common/msg_ids.py, Enum, MsgIds, MSG_ID_HD_REQUEST_DG_SERVICE_RECORD
 common/msg_ids.py, Enum, MsgIds, MSG_ID_HD_REQUEST_UI_CONFIRMATION
 common/msg_ids.py, Enum, MsgIds, MSG_ID_UI_CONFIRMATION_RESULT
-common/msg_ids.py, Enum, MsgIds, MSG_ID_REQUEST_DG_CPLD_STATUS
+common/msg_ids.py, Enum, MsgIds, MSG_ID_REQUEST_CPLD_STATUS
 common/msg_ids.py, Enum, MsgIds, MSG_ID_DG_CPLD_STATUS
+common/msg_ids.py, Enum, MsgIds, MSG_ID_HD_BATTERY_MANAGEMENT_DATA
+common/msg_ids.py, Enum, MsgIds, MSG_ID_HD_BATTERY_STATUS_DATA
 common/msg_ids.py, Enum, MsgIds, MSG_ID_CAN_ERROR_COUNT
 common/msg_ids.py, Enum, MsgIds, MSG_ID_TESTER_LOGIN_REQUEST
 common/msg_ids.py, Enum, MsgIds, MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE
@@ -2181,7 +2220,7 @@
 common/msg_ids.py, Enum, MsgIds, MSG_ID_HD_AIR_PUMP_PUBLISH_INTERVAL_OVERRIDE
 common/msg_ids.py, Enum, MsgIds, MSG_ID_HD_SWITCHES_STATUS_OVERRIDE
 common/msg_ids.py, Enum, MsgIds, MSG_ID_HD_SWITCHES_PUBLISH_INTERVAL_OVERRIDE
-common/msg_ids.py, Enum, MsgIds, MSG_ID_HD_BATTERY_REMAINING_PERCENT_OVERRIDE
+common/msg_ids.py, Enum, MsgIds, MSG_ID_HD_BATTERY_REMAINING_CAP_MWH_OVERRIDE
 common/msg_ids.py, Enum, MsgIds, MSG_ID_HD_TEMPERATURES_VALUE_OVERRIDE
 common/msg_ids.py, Enum, MsgIds, MSG_ID_HD_TEMPERATURES_PUBLISH_INTERVAL_OVERRIDE
 common/msg_ids.py, Enum, MsgIds, MSG_ID_HD_FANS_PUBLISH_INTERVAL_OVERRIDE