Index: tools/Code_Report.csv
===================================================================
diff -u -rcb4bb2804ddf85b31701714fd004b9dca6f9735e -r32001abdfb62770761771b563eb6ff517152fc76
--- tools/Code_Report.csv	(.../Code_Report.csv)	(revision cb4bb2804ddf85b31701714fd004b9dca6f9735e)
+++ tools/Code_Report.csv	(.../Code_Report.csv)	(revision 32001abdfb62770761771b563eb6ff517152fc76)
@@ -53,7 +53,11 @@
 ./dg/cpld.py, Function, get_cpld_clean_led(self) -> int:
 ./dg/dialysate_fill.py, Function, cmd_used_bicarb_volume_override(self, volume: float) -> int:
 ./dg/dialysate_fill.py, Function, cmd_fill_mode_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
+<<<<<<< HEAD
 ./dg/dialysate_fill.py, Function, cmd_dialysate_fill_total_volume_override(self, volume: float, reset: int = NO_RESET) -> int:
+=======
+./dg/dialysate_fill.py, Function, cmd_dialysate_fill_integrated_volume_override(self, volume: float, reset: int = NO_RESET) -> int:
+>>>>>>> DEN-14559-dg_hd_dev-hd_dg_dvt-update-part-8
 ./dg/dialysate_fill.py, Function, get_fill_mode_data(self):
 ./dg/dialysate_fill.py, Function, cmd_used_acid_volume_override(self, volume: float) -> int:
 ./dg/dialysate_generator.py, Function, get_version(self):
@@ -104,7 +108,7 @@
 ./dg/flow_sensors.py, Function, cmd_measured_flow_sensor_value_lpm_override(self, sensor_id: int, rate: float,  reset: int = NO_RESET) -> int:
 ./dg/fluid_leak.py, Function, cmd_fluid_leak_state_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
 ./dg/fluid_leak.py, Function, get_fluid_leak_state(self):
-./dg/fluid_leak.py, Function, cmd_fluid_leak_detector_override(self, detected: int, reset: int = NO_RESET) -> int:
+./dg/fluid_leak.py, Function, cmd_fluid_leak_detector_override(self, detected_state: int, reset: int = NO_RESET) -> int:
 ./dg/flush.py, Function, clear_flush_info(self) -> None:
 ./dg/gen_idle.py, Function, cmd_bad_fill_substates_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
 ./dg/gen_idle.py, Function, get_bad_fill_sub_state(self):
@@ -372,7 +376,7 @@
 ./hd/fans.py, Function, get_fans_time_left_to_rpm_alarm(self):
 ./hd/fluid_leak.py, Function, cmd_fluid_leak_state_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
 ./hd/fluid_leak.py, Function, get_fluid_leak_state(self):
-./hd/fluid_leak.py, Function, cmd_fluid_leak_detector_override(self, detected: int, reset: int = NO_RESET) -> int:
+./hd/fluid_leak.py, Function, cmd_fluid_leak_detector_override(self, detected_state: int, reset: int = NO_RESET) -> int:
 ./hd/hd_events.py, Function, clear_hd_event_list(self):
 ./hd/hd_events.py, Function, get_hd_events(self, event_id, number_of_events=1):
 ./hd/hd_events.py, Function, get_hd_nth_event(self, event_id, event_number=0):
@@ -742,7 +746,7 @@
 dg/drain_pump.py, Variable, dac_value
 dg/drain_pump.py, Variable, drain_pump_state
 dg/drain_pump.py, Variable, current_drain_pump_rpm
-dg/drain_pump.py, Variable, target_drain_pump_outlet_pressure
+dg/drain_pump.py, Variable, target_drain_pump_outlet_flow_lpm
 dg/drain_pump.py, Variable, drain_pump_current_A
 dg/drain_pump.py, Variable, drain_pump_direction
 dg/fans.py, Variable, dg_fans_duty_cycle
@@ -1656,6 +1660,16 @@
 common/dg_defs.py, Enum, DGEventList, DG_EVENT_STARTUP
 common/dg_defs.py, Enum, DGEventList, DG_EVENT_OP_MODE_CHANGE
 common/dg_defs.py, Enum, DGEventList, DG_EVENT_SUB_MODE_CHANGE
+common/dg_defs.py, Enum, DGEventList, DG_EVENT_CONCENTRATE_CAP_SWITCH_CHANGE
+common/dg_defs.py, Enum, DGEventList, DG_EVENT_DIALYSATE_CAP_SWITCH_CHANGE
+common/dg_defs.py, Enum, DGEventList, DG_EVENT_CPU_RAM_ERROR_STATUS
+common/dg_defs.py, Enum, DGEventList, DG_EVENT_CAL_RECORD_UPDATE
+common/dg_defs.py, Enum, DGEventList, DG_EVENT_SYSTEM_RECORD_UPDATE
+common/dg_defs.py, Enum, DGEventList, DG_EVENT_SERVICE_UPDATE
+common/dg_defs.py, Enum, DGEventList, DG_EVENT_USAGE_INFO_UPDATE
+common/dg_defs.py, Enum, DGEventList, DG_EVENT_SW_CONFIG_UPDATE
+common/dg_defs.py, Enum, DGEventList, DG_EVENT_SCHEDULED_RUNS_UPDATE
+common/dg_defs.py, Enum, DGEventList, DG_EVENT_HEATERS_INFO_UPDATE
 common/dg_defs.py, Enum, DGEventList, NUM_OF_DG_EVENT_IDS
 common/dg_defs.py, Enum, DGEventDataType, DGEventDataType
 common/dg_defs.py, Enum, DGEventDataType, EVENT_DATA_TYPE_NONE
@@ -1695,11 +1709,10 @@
 common/hd_defs.py, Enum, HDInitStates, HDInitStates
 common/hd_defs.py, Enum, HDInitStates, POST_STATE_START
 common/hd_defs.py, Enum, HDInitStates, POST_STATE_FW_INTEGRITY
-common/hd_defs.py, Enum, HDInitStates, POST_STATE_AC
-common/hd_defs.py, Enum, HDInitStates, POST_STATE_WATCHDOG
-common/hd_defs.py, Enum, HDInitStates, POST_STATE_SAFETY_SHUTDOWN
 common/hd_defs.py, Enum, HDInitStates, POST_STATE_RTC
 common/hd_defs.py, Enum, HDInitStates, POST_STATE_NVDATAMGMT
+common/hd_defs.py, Enum, HDInitStates, POST_STATE_WATCHDOG
+common/hd_defs.py, Enum, HDInitStates, POST_STATE_SAFETY_SHUTDOWN
 common/hd_defs.py, Enum, HDInitStates, POST_STATE_BLOOD_FLOW
 common/hd_defs.py, Enum, HDInitStates, POST_STATE_DIALYSATE_INLET_FLOW
 common/hd_defs.py, Enum, HDInitStates, POST_STATE_DIALYSATE_OUTLET_FLOW
@@ -1899,6 +1912,21 @@
 common/hd_defs.py, Enum, HDEventList, HD_EVENT_STARTUP
 common/hd_defs.py, Enum, HDEventList, HD_EVENT_OP_MODE_CHANGE
 common/hd_defs.py, Enum, HDEventList, HD_EVENT_SUB_MODE_CHANGE
+common/hd_defs.py, Enum, HDEventList, HD_EVENT_DRY_SELF_TEST_CARTRIDGE_RESULT
+common/hd_defs.py, Enum, HDEventList, HD_EVENT_DRY_SELF_TEST_PRESSURE_RESULT
+common/hd_defs.py, Enum, HDEventList, HD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT
+common/hd_defs.py, Enum, HDEventList, HD_EVENT_CPU_RAM_ERROR_STATUS
+common/hd_defs.py, Enum, HDEventList, HD_EVENT_CAL_RECORD_UPDATE
+common/hd_defs.py, Enum, HDEventList, HD_EVENT_SYSTEM_RECORD_UPDATE
+common/hd_defs.py, Enum, HDEventList, HD_EVENT_SERVICE_UPDATE
+common/hd_defs.py, Enum, HDEventList, HD_EVENT_USAGE_INFO_UPDATE
+common/hd_defs.py, Enum, HDEventList, HD_EVENT_SW_CONFIG_UPDATE
+common/hd_defs.py, Enum, HDEventList, HD_EVENT_BUTTON
+common/hd_defs.py, Enum, HDEventList, HD_EVENT_SAFETY_LINE
+common/hd_defs.py, Enum, HDEventList, HD_EVENT_RSRVR_1_LOAD_CELL_START_VALUES
+common/hd_defs.py, Enum, HDEventList, HD_EVENT_RSRVR_1_LOAD_CELL_END_VALUES
+common/hd_defs.py, Enum, HDEventList, HD_EVENT_RSRVR_2_LOAD_CELL_START_VALUES
+common/hd_defs.py, Enum, HDEventList, HD_EVENT_RSRVR_2_LOAD_CELL_END_VALUES
 common/hd_defs.py, Enum, HDEventList, NUM_OF_EVENT_IDS
 common/hd_defs.py, Enum, HDEventDataType, HDEventDataType
 common/hd_defs.py, Enum, HDEventDataType, EVENT_DATA_TYPE_NONE