Index: tests/dg_tests.py =================================================================== diff -u -r26c7b6057f11680681e0a25399b5e5be9b92818d -r0cf6faaa1773d0f95a08db43cf3b47aef7749eaa --- tests/dg_tests.py (.../dg_tests.py) (revision 26c7b6057f11680681e0a25399b5e5be9b92818d) +++ tests/dg_tests.py (.../dg_tests.py) (revision 0cf6faaa1773d0f95a08db43cf3b47aef7749eaa) @@ -74,13 +74,12 @@ info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_elapsed_time, {}, ' 'Cancellation_mode, {}, R1_level, {:5.3f}, R2_level, {:5.3f}, Current_rinse_count, {}, ' - 'Total_rinse_count, {}, UI_state, {}, Top_alarm, {}, ' + 'Total_rinse_count, {}, Top_alarm, {}, ' .format(state, overall_elapsed_time, state_elapsed_time, dg.chemical_disinfect.chemical_disinfect_target_time, ChemCancellationModes(dg.chemical_disinfect.cancellation_mode).name, dg.chemical_disinfect.r1_level, dg.chemical_disinfect.r2_level, dg.chemical_disinfect_flush.rinse_count, dg.chemical_disinfect_flush.rinse_count, - DGChemDisinfectUIStates(dg.chemical_disinfect.chemical_disinfect_ui_state).name, hd.alarms.alarm_top)) return info @@ -569,10 +568,10 @@ def run_chemical_disinfect(): complete_counter = 1 f = open("/home/fw/projects/dialin/tests/chemical_disinfect.log", "w") - #dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect() + dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect() #dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect_flush() - dg.test_configs.cmd_set_test_config(DGTestConfigOptions.TEST_CONFIG_MIX_WITH_WATER.value) + #dg.test_configs.cmd_set_test_config(DGTestConfigOptions.TEST_CONFIG_MIX_WITH_WATER.value) try: while True: @@ -726,7 +725,7 @@ #run_flush_mode() - #run_chemical_disinfect() + run_chemical_disinfect() #hd.alarms.cmd_alarm_state_override(301, 1) #dg.ro_permeate_sample.cmd_send_hd_dg_is_ready_to_dispense() @@ -748,9 +747,9 @@ # print(get_dg_valves_states()) # sleep(1) - while True: - print(dg.rtc.get_rtc_epoch(), hd.rtc.get_rtc_epoch()) - sleep(1) + #while True: + # print(dg.rtc.get_rtc_epoch(), hd.rtc.get_rtc_epoch()) + # sleep(1) #ui = HDSimulator() #ui.cmd_send_hd_operation_mode(3, 1)