Index: tests/dg_tests.py =================================================================== diff -u -rc1ec3baacb779f5176e3a7a619fe49f2dc4c19cd -r77f779d869e95707cb42272511acc48c12430938 --- tests/dg_tests.py (.../dg_tests.py) (revision c1ec3baacb779f5176e3a7a619fe49f2dc4c19cd) +++ tests/dg_tests.py (.../dg_tests.py) (revision 77f779d869e95707cb42272511acc48c12430938) @@ -13,8 +13,8 @@ # @date (original) 16-Jan-2022 # ############################################################################ +import os - from dialin.dg.dialysate_generator import DG from dialin.hd.hemodialysis_device import HD from dialin.ui.hd_simulator import HDSimulator @@ -178,7 +178,6 @@ dg.reservoirs.time_uf_decay, dg.reservoirs.temp_uf_fill, dg.reservoirs.temp_reservoir_use_actual, dg.reservoirs.temp_reservoir_end_fill, dg.reservoirs.temp_avg_fill, dg.reservoirs.temp_last_fill, dg.reservoirs.time_rsrvr_fill)) - return info @@ -342,11 +341,8 @@ def get_blood_leak_info(): - info = ('Blood_leak_state, {}, Blood_leak_status, {}, Blood_leak_detect_set_point, {}, Blood_leak_detect_level, {},' - ' Blood_leak_led_intensity, {}, ' - .format(hd.blood_leak.get_blood_leak_state(), hd.blood_leak.get_blood_leak_status(), - hd.blood_leak.get_blood_leak_detect_set_point(), hd.blood_leak.get_blood_leak_detect_level(), - hd.blood_leak.get_blood_leak_led_intensity())) + info = ('Blood_leak_state, {}, Blood_leak_status, {}, ' + .format(hd.blood_leak.get_blood_leak_state(), hd.blood_leak.get_blood_leak_status())) return info @@ -446,7 +442,8 @@ def collect_treatment_data(): - f = open("/home/fw/projects/dialin/tests/treatment_run.log", "w") + address = os.path.join(os.getcwd(), "treatment_run.log") + f = open(address, "w") #dg.conductivity_sensors.cmd_conductivity_sensor_override(ConductivitySensorsEnum.CPI.value, 1500.00) #sleep(1) @@ -492,7 +489,7 @@ blood_leak = get_blood_leak_info() hd_pumps = get_hd_pumps_info() fill_info = get_dg_fill_info() - idle_bad_fill = get_dg_idle_bad_fill_info() + idle_bad_fill = '0,' #get_dg_idle_bad_fill_info() uv = get_uv_reactors_info() hd_fans = get_hd_fans_info() hd_pressures = get_hd_occlusion_pressures_info() @@ -512,11 +509,12 @@ def run_heat_disinfect(): complete_counter = 1 - f = open("/home/fw/projects/dialin/tests/Heat_disinfect.log", "w") + address = os.path.join(os.getcwd(), "heat_disinfect.log") + f = open(address, "w") #dg.heaters.cmd_heaters_broadcast_interval_override(50) #sleep(1) - dg.hd_proxy.cmd_start_stop_dg_heat_disinfect() - #dg.hd_proxy.cmd_start_stop_dg_heat_disinfect_active_cool() + #dg.hd_proxy.cmd_start_stop_dg_heat_disinfect() + dg.hd_proxy.cmd_start_stop_dg_heat_disinfect_active_cool() try: while True: @@ -563,7 +561,7 @@ def run_chemical_disinfect(): complete_counter = 1 f = open("/home/fw/projects/dialin/tests/chemical_disinfect.log", "w") - dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect() + #dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect() #dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect_flush() try: @@ -657,40 +655,6 @@ # print(event) -def run_nelson_support_modes(): - - dg.heat_disinfect.cmd_set_nelson_support_mode(NelsonSupportModes.NELSON_POS_CONTROL_HEAT_DISINFECT.value) - - f = open("/home/fw/projects/dialin/tests/Nelson_Support.log", "w") - - try: - while True: - - disinfect = get_heat_disinfect_mode_info() - #disinfect = get_chemical_disinfect_mode_info() - drain = get_drain_states_info() - load_cell = get_load_cells_info() - valves = get_dg_valves_states() - ro = get_ro_info() - temp = get_temperature_sensors_info() - heaters = get_heaters_info() - uv = get_uv_reactors_info() - dg_fans = get_dg_fans_info() - hd_fans = get_hd_fans_info() - conc = get_concentrate_pumps_info() - - var = disinfect + load_cell + drain + ro + temp + heaters + uv + dg_fans + hd_fans + valves + conc + '\r' - - print(var) - f.write(var) - sleep(1) - - except KeyboardInterrupt: - dg.hd_proxy.cmd_start_stop_dg_heat_disinfect(start=False) - dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect(start=False) - f.close() - - if __name__ == "__main__": dg = DG(log_level='DEBUG') dg.cmd_log_in_to_dg() @@ -699,13 +663,13 @@ hd.cmd_log_in_to_hd() sleep(1) - #run_heat_disinfect() + run_heat_disinfect() #run_flush_mode() #run_chemical_disinfect() - #run_chem_disinfect_flush_mode() + #hd.alarms.cmd_alarm_state_override(319, 1) #run_dg() @@ -715,7 +679,7 @@ #collect_hd_treatment() - run_nelson_support_modes() + #run_nelson_support_modes() #while True: # print(get_hd_fans_info(), get_dg_fans_info(), get_temperature_sensors_info()) @@ -733,12 +697,4 @@ #hd.cmd_hd_software_reset_request() - #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)