Index: tests/dg_tests.py =================================================================== diff -u -rae43c05f20c84d0d1ff8954d9e2b78df43ec5352 -rd8c3144d4fc5612981aa1bcee798a7c4756295bd --- tests/dg_tests.py (.../dg_tests.py) (revision ae43c05f20c84d0d1ff8954d9e2b78df43ec5352) +++ tests/dg_tests.py (.../dg_tests.py) (revision d8c3144d4fc5612981aa1bcee798a7c4756295bd) @@ -116,11 +116,12 @@ overall_elapsed_time = dg.heat_disinfect_active_cool.overall_elapsed_time state_elapsed_time = dg.heat_disinfect_active_cool.state_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(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, + info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_RO_77, {}, Disinfect_RO_82, {}, ' + 'Disinfect_R_77, {}, Disinfect_R_82, {}, R1_level, {:5.3f}, R2_level, {:5.3f}, Top_alarm, {}, UI_state, {}, ' + .format(state, overall_elapsed_time, state_elapsed_time, dg.heat_disinfect.disinfect_ro_77_time_s, + dg.heat_disinfect.disinfect_ro_82_time_s, dg.heat_disinfect.disinfect_r_77_time_s, + dg.heat_disinfect.disinfect_r_82_time_s, dg.heat_disinfect.r1_level, dg.heat_disinfect.r2_level, + hd.alarms.alarm_top, DGHeatDisinfectUIStates(dg.heat_disinfect.heat_disinfect_ui_state).name)) return info @@ -730,7 +731,7 @@ hd.cmd_log_in_to_hd() sleep(1) - #run_heat_disinfect() + run_heat_disinfect() #run_flush_mode() @@ -772,6 +773,12 @@ #hd.cmd_hd_software_reset_request() - #dg.cmd_dg_set_operation_mode(2) - hd.cmd_hd_set_operation_mode(2) + #dg.cmd_dg_software_reset_request() + #sleep(6) + #dg.temperatures.cmd_temperatures_value_override(0, 30) + #sleep(1) + #dg.valves.cmd_valve_override(8, 1) + #sleep(1) + #dg.pressures.cmd_pressure_override(0, 4) + #dg.conductivity_sensors.cmd_conductivity_sensor_override(0, 3000)