Index: tests/test_flush.py =================================================================== diff -u -r8474f8e345f165187d4dde17840575ee4e98a9b4 -ra901fe931c08daea69337c1f44135637a764ce7a --- tests/test_flush.py (.../test_flush.py) (revision 8474f8e345f165187d4dde17840575ee4e98a9b4) +++ tests/test_flush.py (.../test_flush.py) (revision a901fe931c08daea69337c1f44135637a764ce7a) @@ -17,22 +17,27 @@ import sys sys.path.append("..") from dialin.dg.dialysate_generator import DG +from dialin.hd.hemodialysis_device import HD from dialin.dg.drain_pump import DrainPumpStates from time import sleep def get_flush_mode_info(): - info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Drain_vol, {:5.3f}, ' + info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Drain_vol, {:5.3f}, Top_alarm, {}, ' .format(dg.flush.flush_state, dg.flush.overall_elapsed_time, dg.flush.state_elapsed_time, - dg.flush.flush_drain_line_volume_l)) + dg.flush.flush_drain_line_volume_l, hd.alarms.alarm_top)) return info + def get_concentrate_pumps_info(): - info = ('Bicarb_tgt_speed, {:5.3f}, Bicarb_speed, {:5.3f}, CPo, {:5.3f}, CD1, {:5.3f}, CD2, {:5.3f}, ' + 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}, ' .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)) return info @@ -85,6 +90,13 @@ return info +def get_uv_reactors_info(): + + info = ('Inlet_status, {}, Outlet_status, {}, ' + .format(dg.uv_reactors.inlet_uv_reactor_state, dg.uv_reactors.outlet_uv_reactor_state)) + return info + + def run_flush_mode(): complete_counter = 1 @@ -97,9 +109,10 @@ drain = get_drain_states_info() ro = get_ro_info() conc = get_concentrate_pumps_info() + uv_reactors = get_uv_reactors_info() valves = get_dg_valves_states() - var = flush + load_cell + drain + ro + conc + valves + '\r' + var = flush + load_cell + drain + ro + conc + uv_reactors + valves + '\r' print(var) f.write(var) @@ -123,7 +136,10 @@ if __name__ == "__main__": dg = DG(log_level='DEBUG') + hd = HD(log_level='DEBUG') dg.cmd_log_in_to_dg() sleep(1) + hd.cmd_log_in_to_hd() + sleep(1) run_flush_mode()