Index: tests/dg_tests.py =================================================================== diff -u -r2cd447a1cae7c32c9f2fa6048c89252563e9d9e6 -re67b967e9fe09d1e842efc04fa52e477165f0fb3 --- tests/dg_tests.py (.../dg_tests.py) (revision 2cd447a1cae7c32c9f2fa6048c89252563e9d9e6) +++ tests/dg_tests.py (.../dg_tests.py) (revision e67b967e9fe09d1e842efc04fa52e477165f0fb3) @@ -253,12 +253,13 @@ def get_concentrate_pumps_info(): info = ('Bicarb_tgt_speed, {:5.3f}, Bicarb_speed, {:5.3f}, Acid_tgt_speed, {:5.3f}, Acid_speed, {:5.3f}, ' - 'CPo, {:5.3f}, CD1, {:5.3f}, CD2, {:5.3f}, CP1_state, {}, CP2_state, {}, CPi_status, {}, CPo_status, {}, ' - 'CD1_status, {}, CD2_status, {}, CP1_pulse, {:5.3f}, CP2_pulse, {:5.3f}, ' + 'CPi, {:5.3f}, CPo, {:5.3f}, CD1, {:5.3f}, CD2, {:5.3f}, CP1_state, {}, CP2_state, {}, CPi_status, {}, ' + 'CPo_status, {}, CD1_status, {}, CD2_status, {}, CP1_pulse, {:5.3f}, CP2_pulse, {:5.3f}, ' .format(dg.concentrate_pumps.concentrate_pump_cp2_current_set_speed, dg.concentrate_pumps.concentrate_pump_cp2_measured_speed, dg.concentrate_pumps.concentrate_pump_cp1_current_set_speed, dg.concentrate_pumps.concentrate_pump_cp1_measured_speed, + dg.conductivity_sensors.conductivity_sensor_cpi, dg.conductivity_sensors.conductivity_sensor_cpo, dg.conductivity_sensors.conductivity_sensor_cd1, dg.conductivity_sensors.conductivity_sensor_cd2, DGConcentratePumpsStates(dg.concentrate_pumps.concentrate_pump_cp1_current_state).name, @@ -625,16 +626,20 @@ # cmd_set_disinfect_ui_screen() - #collect_treatment_data() + collect_treatment_data() #collect_hd_treatment() # test_dg_fans_alarms() #test_dvt_drain_pump() - test_conc_pumps() + #test_conc_pumps() + #while True: + # print(get_concentrate_pumps_info()) + # sleep(1) + #ui = HDSimulator() #ui.cmd_send_hd_operation_mode(3, 1)