Index: tests/dg_heat_and_chemical_disinfect_test.py =================================================================== diff -u -r09cbb74248e9fb44ea81b9a2131d81e96e4a9d8d -rb70eb3eb8264ba114ee8ddb968c697ac7da5b4e9 --- tests/dg_heat_and_chemical_disinfect_test.py (.../dg_heat_and_chemical_disinfect_test.py) (revision 09cbb74248e9fb44ea81b9a2131d81e96e4a9d8d) +++ tests/dg_heat_and_chemical_disinfect_test.py (.../dg_heat_and_chemical_disinfect_test.py) (revision b70eb3eb8264ba114ee8ddb968c697ac7da5b4e9) @@ -8,7 +8,7 @@ # @file dg_heat_and_chemical_disinfect_test.py # # @author (last) Dara Navaei -# @date (last) 04-Nov-2021 +# @date (last) 12-Nov-2021 # @author (original) Dara Navaei # @date (original) 02-May-2021 # @@ -28,6 +28,7 @@ from dialin.hd.temperatures import HDTemperaturesNames from dialin.common.hd_defs import HDOpModes, HDOpSubModes from dialin.common.dg_defs import DGEventList +from dialin.common.hd_defs import HDEventList from time import sleep from datetime import datetime import sys @@ -70,8 +71,10 @@ def get_hd_run_info(): - info = ('HD_op_mode, {}, HD_sub_mode, {}, '.format(HDOpModes(hd.hd_operation_mode).name, - hd.hd_operation_sub_mode)) + info = ('HD_op_mode, {}, HD_sub_mode, {}, Op, {}, Sub, {}, '.format(HDOpModes(hd.hd_operation_mode).name, + hd.hd_operation_sub_mode, + hd.hd_events.get_hd_events(HDEventList(1).value), + hd.hd_events.get_hd_events(HDEventList(2).value))) return info @@ -426,6 +429,8 @@ def collect_treatment_data(): f = open("/home/fw/projects/dialin/tests/treatment_run.log", "w") + #dg.cmd_dg_software_reset_request() + try: while True: hd_run = get_hd_run_info() @@ -449,6 +454,22 @@ f.close() +def collect_hd_treatment(): + f = open("/home/fw/projects/dialin/tests/treatment_run_hd.log", "w") + + hd.cmd_hd_software_reset_request() + + try: + while True: + + sleep(1) + except KeyboardInterrupt: + events = hd.hd_events.get_hd_events(2, 0) + for event in events: + print(event) + f.close() + + def run_heat_disinfect(): complete_counter = 1 f = open("/home/fw/projects/dialin/tests/Heat_disinfect.log", "w") @@ -554,7 +575,7 @@ # run_chemical_disinfect() - #run_dg() + run_dg() # run_ro_pump_duty_cycles() @@ -564,32 +585,11 @@ # cmd_test_heaters() - # collect_treatment_data() + #collect_treatment_data() + #collect_hd_treatment() - print(dg.rtc.get_rtc_epoch()) - sleep(0.1) - #dg.rtc.cmd_stop_rtc() - dg.rtc.cmd_set_rtc_time_and_date(45, 27, 17, 4, 11, 2021) - """ - sleep(6) - - print(dg.rtc.get_rtc_epoch()) - - sleep(1) - - dg.rtc.cmd_set_rtc_time_and_date(22, 18, 17, 4, 11, 2021) - - while True: - print(dg.rtc.get_rtc_epoch()) - sleep(1) - """ - - - - -