Index: tests/dg_tests.py =================================================================== diff -u -r920d1a0826639951cd7f6cfa07b41dc175083043 -r117251d18835541ec1d8beb5b4fa3be08ccce83d --- tests/dg_tests.py (.../dg_tests.py) (revision 920d1a0826639951cd7f6cfa07b41dc175083043) +++ tests/dg_tests.py (.../dg_tests.py) (revision 117251d18835541ec1d8beb5b4fa3be08ccce83d) @@ -42,6 +42,7 @@ from dialin.dg.conductivity_sensors import ConductivitySensorsEnum from dialin.dg.voltages import DGMonitoredVoltages from dialin.hd.valves import HDValves +from dialin.hd.voltages import HDMonitoredVoltages from dialin.hd.pretreatment import PreTreatmentRsrvrState from time import sleep from datetime import datetime @@ -241,13 +242,12 @@ def get_hd_fans_info(): info = ('HD_Fan_DC, {:5.3f}, Target_HD_RPM, {:5.3f}, Inlet1_RPM, {:5.3f}, HD_Board_temp, {:5.3f}, ' - 'HD_Power_supply, {:5.3f}, HD_FPGA_temp, {:5.3f}, PBA_ADC_temp, {:5.3f}, Venous_temp, {:5.3f}, ' + 'HD_Power_supply, {:5.3f}, HD_FPGA_temp, {:5.3f}, Venous_temp, {:5.3f}, ' 'Arterial_temp, {:5.3f}, RPM_time_offset, {}, ' .format(hd.fans.duty_cycle, hd.fans.target_rpm, hd.fans.inlet_1_rpm, hd.temperatures.hd_temperatures[HDTemperaturesNames.THERMISTOR_ONBOARD_NTC.name], hd.temperatures.hd_temperatures[HDTemperaturesNames.THERMISTOR_POWER_SUPPLY_1.name], hd.temperatures.hd_temperatures[HDTemperaturesNames.TEMPSENSOR_FPGA_BOARD.name], - hd.temperatures.hd_temperatures[HDTemperaturesNames.TEMPSENSOR_PBA_ADC_SENSOR.name], hd.temperatures.hd_temperatures[HDTemperaturesNames.TEMPSENSOR_VENOUS_PRESS_TEMP.name], hd.temperatures.hd_temperatures[HDTemperaturesNames.TEMPSENSOR_ARTERIAL_PRESS_TEMP.name], hd.fans.rpm_alarm_time)) @@ -290,9 +290,11 @@ def get_hd_pumps_info(): - info = ('DialIn_tgt_flow, {}, DialIn_meas_flow, {:5.3f}, ' + info = ('DialIn_tgt_flow, {}, DialIn_meas_flow, {:5.3f}, DialIn_current, {:5.3f}, DialOut_current, {:5.3f}, ' .format(hd.dialysate_inlet_flow.target_dialysate_inlet_flow_rate, - hd.dialysate_inlet_flow.measured_dialysate_inlet_flow_rate)) + hd.dialysate_inlet_flow.measured_dialysate_inlet_flow_rate, + hd.dialysate_inlet_flow.measured_dialysate_inlet_pump_mc_current, + hd.dialysate_outlet_flow.measured_dialysate_outlet_pump_mc_current)) return info @@ -311,6 +313,12 @@ return info +def get_voltages_info(): + info = ('HD_24, {:5.3f}, HD_24_regen, {:5.3f}, '. + format(hd.voltages.monitored_voltages[HDMonitoredVoltages.MONITORED_LINE_24V.value], + hd.voltages.monitored_voltages[HDMonitoredVoltages.MONITORED_LINE_24V_REGEN.value])) + return info + def run_dg(): counter = 1 timer = 0.1 @@ -447,13 +455,22 @@ #hd.cmd_hd_software_reset_request() + hd.dialysate_inlet_flow.cmd_dialysate_inlet_flow_broadcast_interval_override(50) + sleep(1) + hd.dialysate_outlet_flow.cmd_dialysate_outlet_flow_broadcast_interval_override(50) + sleep(1) + hd.voltages.cmd_monitored_voltages_broadcast_interval_override(50) + try: while True: - sleep(1) + hd_run = get_hd_run_info() + pumps_info = get_hd_pumps_info() + voltages = get_voltages_info() + var = hd_run + pumps_info + voltages + '\r' + print(var) + f.write(var) + sleep(0.05) except KeyboardInterrupt: - events = hd.hd_events.get_hd_events(2, 0) - for event in events: - print(event) f.close() @@ -651,7 +668,7 @@ #run_heat_disinfect() - # run_chemical_disinfect() + run_chemical_disinfect() #run_dg() @@ -673,12 +690,10 @@ #test_dvt_drain_pump() - test_conc_pumps() + #test_conc_pumps() #ui = HDSimulator() #ui.cmd_send_hd_operation_mode(3, 1) #test_hd_valves() - -