Index: tests/dg_tests.py =================================================================== diff -u -r3553789d2a6b1a0ff024a45cd7b47a2ba06f96b3 -rd26df54d17cf3f84471ba2a15e031b6a4f1f04f7 --- tests/dg_tests.py (.../dg_tests.py) (revision 3553789d2a6b1a0ff024a45cd7b47a2ba06f96b3) +++ tests/dg_tests.py (.../dg_tests.py) (revision d26df54d17cf3f84471ba2a15e031b6a4f1f04f7) @@ -164,11 +164,12 @@ def get_drain_states_info(): - info = ('Drain, {}, DAC, {}, Tgt_RPM, {}, Curr_RPM, {}, PRd, {:5.3f}, PDr, {:5.3f}, '. - format(DrainPumpStates(dg.drain_pump.drain_pump_state).name, dg.drain_pump.dac_value, - dg.drain_pump.target_drain_pump_rpm, dg.drain_pump.current_drain_pump_rpm, - dg.pressures.drain_pump_inlet_pressure, - dg.pressures.drain_pump_outlet_pressure)) + info = ('Drain, {}, DAC, {}, Tgt_RPM, {}, Curr_RPM, {}, PRd, {:5.3f}, PDr, {:5.3f}, Drain_curr_A, {:5.3f}, ' + 'Drain_dir, {}, ' + .format(DrainPumpStates(dg.drain_pump.drain_pump_state).name, dg.drain_pump.dac_value, + dg.drain_pump.target_drain_pump_rpm, dg.drain_pump.current_drain_pump_rpm, + dg.pressures.drain_pump_inlet_pressure, dg.pressures.drain_pump_outlet_pressure, + dg.drain_pump.drain_pump_current_A, dg.drain_pump.drain_pump_direction)) return info @@ -514,8 +515,9 @@ dg_fans = get_dg_fans_info() hd_fans = get_hd_fans_info() conc = get_concentrate_pumps_info() + uv = get_uv_reactors_info() - var = disinfect + load_cell + drain + ro + temp + heaters + uv + dg_fans + hd_fans + valves + conc + '\r' + var = disinfect + load_cell + drain + ro + temp + heaters + uv + dg_fans + hd_fans + valves + conc + uv + '\r' print(var) f.write(var) @@ -688,7 +690,7 @@ hd.cmd_log_in_to_hd() sleep(1) - #run_heat_disinfect() + run_heat_disinfect() #run_flush_mode() @@ -698,7 +700,7 @@ # cmd_set_disinfect_ui_screen() - collect_treatment_data() + #collect_treatment_data() #collect_hd_treatment()