Index: tools/Code_Report.csv =================================================================== diff -u -r490dfc76fc8306894766c8edf53e608d31566394 -r7956c4b83d4c70b47b137d9e3782d6b1ea96361d --- tools/Code_Report.csv (.../Code_Report.csv) (revision 490dfc76fc8306894766c8edf53e608d31566394) +++ tools/Code_Report.csv (.../Code_Report.csv) (revision 7956c4b83d4c70b47b137d9e3782d6b1ea96361d) @@ -20,6 +20,7 @@ ./dg/calibration_record.py, Function, cmd_set_dg_calibration_excel_to_fw(self, report_address: str): ./dg/calibration_record.py, Function, cmd_set_dg_calibration_record(self, previous_record: OrderedDict) -> bool: ./dg/calibration_record.py, Function, cmd_reset_dg_calibration_record(self) -> bool: +./dg/chemical_disinfect_flush.py, Function, clear_flush_info(self) -> None: ./dg/chemical_disinfect.py, Function, clear_chem_disinfect_info(self) -> None: ./dg/concentrate_pumps.py, Function, cmd_concentrate_pump_state_change_request(self, pump_id: int, on: bool = False) -> int: ./dg/concentrate_pumps.py, Function, cmd_concentrate_pump_target_speed_override(self, pump_id: int, speed: float) -> int: @@ -93,6 +94,7 @@ ./dg/hd_proxy.py, Function, cmd_start_stop_dg_heat_disinfect(self, start: bool = True) -> int: ./dg/hd_proxy.py, Function, cmd_start_stop_dg_flush(self, start: bool = True) -> int: ./dg/hd_proxy.py, Function, cmd_start_stop_dg_chemical_disinfect(self, start: bool = True) -> int: +./dg/hd_proxy.py, Function, cmd_start_stop_dg_chemical_disinfect_flush(self, start: bool = True) -> int: ./dg/hd_proxy.py, Function, cmd_resend_dg_alarms(self) -> int: ./dg/hd_proxy.py, Function, cmd_hd_communication_status_override(self, status: bool, reset: int = NO_RESET) -> int: ./dg/hd_proxy.py, Function, cmd_switch_reservoirs(self, reservoir_id: int = RESERVOIR1) -> int: @@ -576,6 +578,14 @@ dg/alarms.py, Variable, alarm_conditions dg/alarms.py, Variable, safety_shutdown_active dg/calibration_record.py, Variable, dg_calibration_record +dg/chemical_disinfect_flush.py, Variable, flush_state +dg/chemical_disinfect_flush.py, Variable, overall_elapsed_time +dg/chemical_disinfect_flush.py, Variable, state_elapsed_time +dg/chemical_disinfect_flush.py, Variable, r1 +dg/chemical_disinfect_flush.py, Variable, r2 +dg/chemical_disinfect_flush.py, Variable, target_rinse_count +dg/chemical_disinfect_flush.py, Variable, rinse_count +dg/chemical_disinfect_flush.py, Variable, flush_UI_state dg/chemical_disinfect.py, Variable, chemical_disinfect_state dg/chemical_disinfect.py, Variable, overall_elapsed_time dg/chemical_disinfect.py, Variable, state_elapsed_time @@ -627,6 +637,7 @@ dg/dialysate_generator.py, Variable, alarms dg/dialysate_generator.py, Variable, calibration_record dg/dialysate_generator.py, Variable, chemical_disinfect +dg/dialysate_generator.py, Variable, chemical_disinfect_flush dg/dialysate_generator.py, Variable, concentrate_pumps dg/dialysate_generator.py, Variable, conductivity_sensors dg/dialysate_generator.py, Variable, dialysate_fill @@ -1370,6 +1381,7 @@ common/dg_defs.py, Enum, DGOpModes, DG_MODE_FLUS common/dg_defs.py, Enum, DGOpModes, DG_MODE_HEAT common/dg_defs.py, Enum, DGOpModes, DG_MODE_CHEM +common/dg_defs.py, Enum, DGOpModes, DG_MODE_CHFL common/dg_defs.py, Enum, DGOpModes, DG_MODE_NLEG common/dg_defs.py, Enum, DGOpModes, NUM_OF_DG_MODES common/dg_defs.py, Enum, DGInitStates, DGInitStates @@ -1509,27 +1521,36 @@ common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_DRAIN_R2 common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_FLUSH_DRAIN common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_FLUSH_CIRCULATION -common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_FLUSH_R1_AND_R2 -common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1 -common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_FLUSH_DRAIN_R2 -common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_FLUSH_DRAIN_R1 -common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_PRIME_ACID_LINE -common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_FILL_WITH_WATER_AND_DISINFECTANT -common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_REMOVE_ACID_BOTTLE_FROM_UI +common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_PRIME_DISINFECTANT +common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_DISINFECTANT_FLUSH +common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_FILL_WITH_DISINFECTANT common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_DISINFECT_R1_TO_R2 -common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_FILL_R2_WITH_DISINFECTANT +common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_PARTIAL_DRAIN_R1_FILL_R2_TO_R1 common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_DISINFECT_R2_TO_R1 -common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_COOL_DOWN_HEATERS -common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_DISINFECTANT_DRAIN_R1 -common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_DISINFECTANT_DRAIN_R2 -common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_RINSE_R1_TO_R2 -common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1 -common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_RINSE_R1_TO_R2_AND_DRAIN_R2 -common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_RINSE_CIRCULATION +common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_PARTIAL_DRAIN_R2_FILL_R1_TO_R2 common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_CANCEL_BASIC_PATH common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_COMPLETE common/dg_defs.py, Enum, DGChemicalDisinfectStates, NUM_OF_DG_CHEM_DISINFECT_STATES +common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DGChemDisinfectFlushStates +common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_START +common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_DISINFECTANT_DRAIN_R1 +common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_DISINFECTANT_DRAIN_R2 +common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DRAIN +common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DISINFECTANT_LINE +common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_UF +common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R2_TO_R1_DRAIN_R1 +common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R1_TO_R2_DRAIN_R2 +common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_BASIC_PATH +common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH +common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_COMPLETE +common/dg_defs.py, Enum, DGChemDisinfectFlushStates, NUM_OF_DG_CHEM_DISINFECT_FLUSH_STATES +common/dg_defs.py, Enum, DGChemDisinfectFlushUIStates, DGChemDisinfectFlushUIStates +common/dg_defs.py, Enum, DGChemDisinfectFlushUIStates, CHEM_DISINFECT_FLUSH_UI_STATE_NOT_RUNNING +common/dg_defs.py, Enum, DGChemDisinfectFlushUIStates, CHEM_DISINFECT_FLUSH_UI_STATE_FLUSH_AFTER_DISINFECT +common/dg_defs.py, Enum, DGChemDisinfectFlushUIStates, CHEM_DISINFECT_FLUSH_UI_STATE_CANCEL_FLUSH +common/dg_defs.py, Enum, DGChemDisinfectFlushUIStates, CHEM_DISINFECT_FLUSH_UI_STATE_COMPLETE +common/dg_defs.py, Enum, DGChemDisinfectFlushUIStates, NUM_OF_CHEM_DISINFECT_FLUSH_UI_STATES common/dg_defs.py, Enum, DGChemDisinfectUIStates, DGChemDisinfectUIStates common/dg_defs.py, Enum, DGChemDisinfectUIStates, CHEM_DISINFECT_UI_STATE_NOT_RUNNING common/dg_defs.py, Enum, DGChemDisinfectUIStates, CHEM_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT @@ -2069,6 +2090,11 @@ 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_DG_CHEM_DISINFECT_FLUSH_DATA +common/msg_ids.py, Enum, MsgIds, MSG_ID_DG_CHEM_DISINFECT_FLUSH_TIME_DATA +common/msg_ids.py, Enum, MsgIds, MSG_ID_DG_START_STOP_CHEM_DISINFECT_FLUSH +common/msg_ids.py, Enum, MsgIds, MSG_ID_UI_CHEM_DISINFECT_FLUSH_CONFIRM +common/msg_ids.py, Enum, MsgIds, MSG_ID_HD_CHEM_DISINFECT_FLUSH_CONFIRM_RESPONSE 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