Index: tests/dg_tests.py =================================================================== diff -u -r5ea9bb5784c334aef0e9baea8e37c476dcf79e35 -rca3dffa6d804bbaeff6eb1009edf88835107dc44 --- tests/dg_tests.py (.../dg_tests.py) (revision 5ea9bb5784c334aef0e9baea8e37c476dcf79e35) +++ tests/dg_tests.py (.../dg_tests.py) (revision ca3dffa6d804bbaeff6eb1009edf88835107dc44) @@ -46,7 +46,7 @@ from dialin.hd.valves import HDValves from dialin.hd.voltages import HDMonitoredVoltages from dialin.hd.pretreatment import PreTreatmentRsrvrState -from dialin.common.dg_defs import DGFlushStates +from dialin.common.dg_defs import DGFlushStates, DGHeatDisinfectActiveCoolStates from time import sleep from datetime import datetime import sys @@ -70,10 +70,21 @@ def get_heat_disinfect_mode_info(): + state = 0 + state_elapsed_time = 0 + overall_elapsed_time = 0 + if dg.dg_operation_mode == 9: + state = DGHeatDisinfectStates(dg.heat_disinfect.heat_disinfect_state).name + overall_elapsed_time = dg.heat_disinfect.overall_elapsed_time + state_elapsed_time = dg.heat_disinfect.state_elapsed_time + elif dg.dg_operation_mode == 12: + state = DGHeatDisinfectActiveCoolStates(dg.heat_disinfect_active_cool.heat_disinfect_active_cool_state).name + state_elapsed_time = dg.heat_disinfect_active_cool.state_elapsed_time + overall_elapsed_time = dg.heat_disinfect_active_cool.overall_elapsed_time + info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_elapsed_time, {}, ' 'R1_level, {:5.3f}, R2_level, {:5.3f}, Top_alarm, {}, UI_state, {}, ' - .format(DGHeatDisinfectStates(dg.heat_disinfect.heat_disinfect_state).name, - dg.heat_disinfect.overall_elapsed_time, dg.heat_disinfect.state_elapsed_time, + .format(state, overall_elapsed_time, state_elapsed_time, dg.heat_disinfect.heat_disinfect_count_down_time, dg.heat_disinfect.r1_level, dg.heat_disinfect.r2_level, hd.alarms.alarm_top, DGHeatDisinfectUIStates(dg.chemical_disinfect.chemical_disinfect_ui_state).name))