Index: dialin/dg/load_cells.py =================================================================== diff -u -r23e83eef3f47218e11d5e19a92fcfc24ae35b843 -r2dbb3b03c9e63d2cda582facc6cef28710252a8a --- dialin/dg/load_cells.py (.../load_cells.py) (revision 23e83eef3f47218e11d5e19a92fcfc24ae35b843) +++ dialin/dg/load_cells.py (.../load_cells.py) (revision 2dbb3b03c9e63d2cda582facc6cef28710252a8a) @@ -246,7 +246,7 @@ def cmd_get_load_cells_tare_values(self): """ - Constructs and sends the load cell override command + Constructs and sends the load cell tare values request Constraints: Must be logged into DG. @return: 1 if successful, zero otherwise Index: dialin/hd/ui_proxy.py =================================================================== diff -u -r428c5c0a653129867b1cb32b5e64f89f68191c4b -r2dbb3b03c9e63d2cda582facc6cef28710252a8a --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 428c5c0a653129867b1cb32b5e64f89f68191c4b) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 2dbb3b03c9e63d2cda582facc6cef28710252a8a) @@ -1268,9 +1268,9 @@ else: self.logger.debug("Invalid param_idx given.") - def cmd_set_treatment_parameters(self, bld_flow: int = 100, - dia_flow: int = 100, - duration: int = 240, + def cmd_set_treatment_parameters(self, bld_flow: int = 350, + dia_flow: int = 300, + duration: int = 60, hep_rate: float = 0.0, hep_bol: float = 0.0, hep_stop: int = 0, @@ -1280,10 +1280,10 @@ dialyzer: int = 0, hep_type: int = 0, dia_temp: float = 37.0, - art_low: int = -300, - art_high: int = 0, - ven_low: int = 20, - ven_high: int = 400, + art_low: int = -280, + art_high: int = 70, + ven_low: int = 40, + ven_high: int = 290, bp_intvl: int = 30, rb_flow: int = 75) -> None: """ Index: tests/dg_tests.py =================================================================== diff -u -r23e83eef3f47218e11d5e19a92fcfc24ae35b843 -r2dbb3b03c9e63d2cda582facc6cef28710252a8a --- tests/dg_tests.py (.../dg_tests.py) (revision 23e83eef3f47218e11d5e19a92fcfc24ae35b843) +++ tests/dg_tests.py (.../dg_tests.py) (revision 2dbb3b03c9e63d2cda582facc6cef28710252a8a) @@ -649,9 +649,9 @@ hd.cmd_log_in_to_hd() sleep(1) - while True: - print(dg.rtc.get_rtc_epoch()) - sleep(1) + hd.test_configs.cmd_set_test_config(HDTestConfigOptions.TEST_CONFIG_USE_WET_CARTRIDGE.value) + sleep(1) + hd.test_configs.cmd_set_test_config(HDTestConfigOptions.TEST_CONFIG_DISABLE_WET_SELFTEST_DISPLACEMENT_CHECK.value) #dg.load_cells.cmd_get_load_cells_tare_values() #while True: Index: tests/tx_test_config_tests.py =================================================================== diff -u -rd1073574dd277c429fe6c63ec23819dfc3347850 -r2dbb3b03c9e63d2cda582facc6cef28710252a8a --- tests/tx_test_config_tests.py (.../tx_test_config_tests.py) (revision d1073574dd277c429fe6c63ec23819dfc3347850) +++ tests/tx_test_config_tests.py (.../tx_test_config_tests.py) (revision 2dbb3b03c9e63d2cda582facc6cef28710252a8a) @@ -5,6 +5,8 @@ from dialin.hd.hemodialysis_device import HD from dialin.dg.load_cells import DGLoadCellNames from dialin.hd.switches import HDSwitchesNames, HDSwitchStatus +from dialin.hd.ui_proxy import TreatmentParameters +from dialin.hd.constants import RESET, NO_RESET from dialin.ui.hd_simulator import HDSimulator from dialin.common.dg_defs import DGHeatDisinfectStates, DGHeatDisinfectUIStates from dialin.dg.heat_disinfect import HeatCancellationModes, NelsonSupportModes @@ -99,10 +101,11 @@ sleep(1) counter += 1 - if counter == 8: - print(counter) + if counter == 8 and dg.dg_operation_mode == 5 and dg.dg_operation_sub_mode == 1: hd.test_configs.cmd_set_test_config(HDTestConfigOptions.TEST_CONFIG_EXPEDITE_PRE_TREATMENT.value) sleep(1) + hd.test_configs.cmd_set_test_config(HDTestConfigOptions.TEST_CONFIG_SKIP_BLOOD_PRIME.value) + sleep(0.5) counter += 1 if counter == 9: @@ -111,24 +114,34 @@ counter += 1 if counter == 10: - hd.ui.cmd_ui_confirm_treatment_parameters() + hd.ui.cmd_ui_confirm_treatment_parameters(1) sleep(1) counter += 1 if counter == 11: - hd.ui.cmd_ui_uf_settings_change_confirm() + hd.ui.cmd_ui_uf_volume_set(0.0) sleep(1) counter += 1 if counter == 12: hd.switches.cmd_hd_switch_status_override(HDSwitchesNames.FRONT_DOOR.value, HDSwitchStatus.OPEN.value) - sleep(1) + sleep(2) counter += 1 if counter == 13: - hd.switches.cmd_hd_switch_status_override(HDSwitchesNames.FRONT_DOOR.value, HDSwitchStatus.CLOSED.value) + hd.switches.cmd_hd_switch_status_override(HDSwitchesNames.FRONT_DOOR.value, HDSwitchStatus.OPEN.value, RESET) + sleep(0.5) counter += 1 + if counter == 14: + hd.ui.cmd_ui_patient_connection_confirm() + sleep(0.5) + counter += 1 + + if counter == 15: + hd.ui.cmd_ui_start_treatment_request() + counter += 1 + sleep(0.5)