Index: tests/dg_tests.py =================================================================== diff -u -rc3fa0bd1ad54dddd9f7faee36d806961959f362c -r7fda529ba6cd2ca3c64028735979c0b65b32b306 --- tests/dg_tests.py (.../dg_tests.py) (revision c3fa0bd1ad54dddd9f7faee36d806961959f362c) +++ tests/dg_tests.py (.../dg_tests.py) (revision 7fda529ba6cd2ca3c64028735979c0b65b32b306) @@ -26,6 +26,7 @@ from dialin.dg.temperatures import DGTemperaturesNames from dialin.dg.dialysate_generator import DGOperationModes from dialin.hd.temperatures import HDTemperaturesNames +from dialin.dg.concentrate_pumps import DGConcentratePumpsStates from dialin.dg.uv_reactors import ReactorsNames from dialin.common.hd_defs import HDOpModes, HDOpSubModes, PreTreatmentWetSelfTesStates from dialin.common.dg_defs import DGEventList @@ -237,13 +238,19 @@ 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}, ' + '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_cpo, dg.conductivity_sensors.conductivity_sensor_cd1, - dg.conductivity_sensors.conductivity_sensor_cd2)) + dg.conductivity_sensors.conductivity_sensor_cd2, + DGConcentratePumpsStates(dg.concentrate_pumps.concentrate_pump_cp1_current_state).name, + DGConcentratePumpsStates(dg.concentrate_pumps.concentrate_pump_cp2_current_state).name, + dg.conductivity_sensors.cpi_sensor_status, dg.conductivity_sensors.cpo_sensor_status, + dg.conductivity_sensors.cd1_sensor_status, dg.conductivity_sensors.cd2_sensor_status, + dg.concentrate_pumps.cp1_temp_pulse, dg.concentrate_pumps.cp2_temp_pulse)) return info @@ -557,16 +564,25 @@ # run_heat_disinfect() - run_chemical_disinfect() + # run_chemical_disinfect() # run_dg() # cmd_set_disinfect_ui_screen() - # collect_treatment_data() + #collect_treatment_data() # collect_hd_treatment() - # test_hd_fans_alarms() + #dg.switches.cmd_dg_switch_status_override(0, 0) + #sleep(1) + #dg.switches.cmd_dg_switch_status_override(1, 0) + while True: + #print(dg.switches.get_switches_status()) + print(get_hd_fans_info()) + sleep(1) + + test_hd_fans_alarms() + # test_dg_fans_alarms()