Index: tests/dg_heat_and_chemical_disinfect_test.py =================================================================== diff -u -r7fa5f37e738a58e4e6a784bcd3e638c06a6d0b9e -rcea384a65cd9f07a347924eb760c012f3520d874 --- tests/dg_heat_and_chemical_disinfect_test.py (.../dg_heat_and_chemical_disinfect_test.py) (revision 7fa5f37e738a58e4e6a784bcd3e638c06a6d0b9e) +++ tests/dg_heat_and_chemical_disinfect_test.py (.../dg_heat_and_chemical_disinfect_test.py) (revision cea384a65cd9f07a347924eb760c012f3520d874) @@ -3,43 +3,48 @@ import sys sys.path.append("..") from dialin.dg.dialysate_generator import DG -from dialin.dg.heat_disinfect import HeatDisinfectStates, CancellationModes -from dialin.dg.chemical_disinfect import ChemicalDisinfectStates, CancellationModes +from dialin.dg.heat_disinfect import HeatDisinfectStates, HeatCancellationModes +from dialin.dg.chemical_disinfect import ChemicalDisinfectStates, ChemCancellationModes from dialin.dg.drain_pump import DrainPumpStates from dialin.dg.thermistors import ThermistorsNames from dialin.dg.temperature_sensors import TemperatureSensorsNames from dialin.dg.dialysate_generator import DGOperationModes -from dialin.dg.valves import * from time import sleep def get_chemical_disinfect_mode_info(): + info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_elapsed_time, {}, ' 'Cancellation_mode, {}, R1_level, {:5.3f}, R1_drift, {:5.3f}, R2_level, {:5.3f}, R2_drift, {:5.3f}, ' 'Current_rinse_count, {}, Total_rinse_count, {}, ' .format(ChemicalDisinfectStates(dg.chemical_disinfect.chemical_disinfect_state).name, dg.chemical_disinfect.overall_elapsed_time, dg.chemical_disinfect.state_elapsed_time, dg.chemical_disinfect.disinfect_elapsed_time, - CancellationModes(dg.chemical_disinfect.cancellation_mode).name, dg.chemical_disinfect.r1_level, + ChemCancellationModes(dg.chemical_disinfect.cancellation_mode).name, dg.chemical_disinfect.r1_level, (dg.chemical_disinfect.r1_level - dg.load_cells.load_cell_A1), dg.chemical_disinfect.r2_level, (dg.chemical_disinfect.r2_level - dg.load_cells.load_cell_B1), dg.chemical_disinfect.current_post_rinse_count, dg.chemical_disinfect.target_post_rinse_count)) return info def get_concentrate_pumps_info(): - pass - # TODO add concentrate pumps and the conductivity sensors information + info = ('Bicarb_tgt_speed, {:5.3f}, Bicarb_speed, {:5.3f}, CPo, {:5.3f}, CD1, {:5.3f}, CD2, {:5.3f}, ' + .format(dg.concentrate_pumps.concentrate_pump_cp2_current_set_speed, + dg.concentrate_pumps.concentrate_pump_cp2_measured_speed, + dg.conductivity_sensors.conductivity_sensor_cpo, dg.conductivity_sensors.conductivity_sensor_cd1, + dg.conductivity_sensors.conductivity_sensor_cd2)) + return info + def get_heat_disinfect_mode_info(): info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_elapsed_time, {}, ' - 'Cancellation_mode, {}, R1_level, {:5.3f}, R1_drift, {:5.3f}, R2_level, {:5.3f}, R2_drift, {:5.3f} ' + 'Cancellation_mode, {}, R1_level, {:5.3f}, R1_drift, {:5.3f}, R2_level, {:5.3f}, R2_drift, {:5.3f}, ' .format(HeatDisinfectStates(dg.heat_disinfect.heat_disinfect_state).name, dg.heat_disinfect.overall_elapsed_time, dg.heat_disinfect.state_elapsed_time, dg.heat_disinfect.disinfect_elapsed_time, - CancellationModes(dg.heat_disinfect.cancellation_mode).name, dg.heat_disinfect.r1_level, + HeatCancellationModes(dg.heat_disinfect.cancellation_mode).name, dg.heat_disinfect.r1_level, (dg.heat_disinfect.r1_level - dg.load_cells.load_cell_A1), dg.heat_disinfect.r2_level, (dg.heat_disinfect.r2_level - dg.load_cells.load_cell_B1))) return info @@ -148,57 +153,68 @@ def run_dg(): counter = 1 + timer = 1 + sleep_time = 0.05 f = open("/home/fw/projects/dialin/tests/run_dg.log", "w") + """ dg.valves.cmd_valve_broadcast_interval_override(50) sleep(0.25) dg.pressures.cmd_pressure_broadcast_interval_override(50) sleep(0.25) dg.drain_pump.cmd_drain_pump_data_broadcast_interval_override(50) sleep(0.25) + dg.ro_pump.cmd_ro_pump_data_broadcast_interval_override(50) + sleep(0.25) + """ dg.hd_proxy.cmd_start_stop_dg() sleep(0.1) - #dg.hd_proxy.cmd_switch_reservoirs(reservoirID=0) - #sleep(0.1) try: while True: dg_run = get_dg_run_info() + temperature = get_temperature_sensors_info() load_cell = get_load_cells_info() drain = get_drain_states_info() ro = get_ro_info() valves = get_dg_valves_states() - var = str(counter) + ', ' + dg_run + load_cell + drain + ro + valves + '\r' + var = str(timer) + ', ' + str(counter) + ', ' + dg_run + temperature + load_cell + drain + ro + \ + valves + '\r' print(var) f.write(var) if DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ dg.dg_operation_sub_mode == 2 and counter == 1: - dg.hd_proxy.cmd_switch_reservoirs(reservoirID=0) - sleep(2) - counter += 1 - if DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ + if timer == 1: + dg.hd_proxy.cmd_switch_reservoirs(reservoirID=1) + + timer += 1 + + if timer > ((1/sleep_time) * 10): + timer = 1 + counter += 1 + + elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ dg.dg_operation_sub_mode == 2 and counter == 2: dg.hd_proxy.cmd_drain(tare_load_cell=True) counter += 1 - sleep(0.15) + timer = 1 - if DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ + elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ dg.dg_operation_sub_mode == 2 and counter == 3: - dg.hd_proxy.cmd_fill(volume=1900) - #dg.hd_proxy.cmd_switch_reservoirs(reservoirID=0) - #sleep(10) - #dg.hd_proxy.cmd_drain() - counter += 1 - #sleep(0.15) - sleep(0.05) + timer += 1 + if timer > 4: + dg.hd_proxy.cmd_fill(volume=1000) + counter += 1 + sleep(sleep_time) + except KeyboardInterrupt: dg.hd_proxy.cmd_start_stop_dg(start=False) f.close() @@ -213,7 +229,7 @@ try: while True: - disinfect = get_dg_run_info() + disinfect = get_heat_disinfect_mode_info() drain = get_drain_states_info() load_cell = get_load_cells_info() valves = get_dg_valves_states() @@ -259,13 +275,14 @@ disinfect = get_chemical_disinfect_mode_info() drain = get_drain_states_info() load_cell = get_load_cells_info() + conc = get_concentrate_pumps_info() valves = get_dg_valves_states() ro = get_ro_info() temp = get_temperature_sensors_info() heaters = get_heaters_info() fans = get_fans_info() - var = disinfect + load_cell + drain + ro + temp + heaters + fans + valves + '\r' + var = disinfect + load_cell + conc + drain + ro + temp + heaters + fans + valves + '\r' print(var) f.write(var) @@ -295,8 +312,8 @@ #run_heat_disinfect() - #run_chemical_disinfect() + run_chemical_disinfect() - run_dg() + #run_dg()