Index: tests/test_uf.py =================================================================== diff -u -r2ef41bc7fb2b7ddd59061ee453ec7efd9f676eda -r970453631a6ccccf10dbe89eab0f131a83c1cf37 --- tests/test_uf.py (.../test_uf.py) (revision 2ef41bc7fb2b7ddd59061ee453ec7efd9f676eda) +++ tests/test_uf.py (.../test_uf.py) (revision 970453631a6ccccf10dbe89eab0f131a83c1cf37) @@ -20,7 +20,7 @@ from leahi_dialin.td.treatment_delivery import TD #from leahi_dialin.dd.dialysate_delivery import DD -#from leahi_dialin.ro.reverse_osmosis import RO +#from leahi_dialin.fp.reverse_osmosis import RO from leahi_dialin.td.modules.valves import ValvesEnum @@ -29,16 +29,16 @@ td = TD(log_level="DEBUG") # create a DD object called dd # dd = DD(log_level="DEBUG") - # create a RO object called ro -# ro = RO(log_level="DEBUG") + # create a RO object called fp +# fp = RO(log_level="DEBUG") sleep(2) # log in to TD, DD and RO as tester if td.cmd_log_in_to_td() == 0: exit(1) # if dd.cmd_log_in_to_dd() == 0: # exit(1) -# if ro.cmd_log_in_to_ro() == 0: +# if fp.cmd_log_in_to_ro() == 0: # exit(1) # sleep(1) @@ -57,7 +57,7 @@ # ", DD.s, " + '{:2d}'.format(dd.dd_operation_sub_mode) pumpSetPts = ", BP.sf, " + '{:4d}'.format(td.blood_flow.set_blood_flow_rate) + \ ", BP.ss, " + '{:9.2f}'.format(td.blood_flow.set_rpm) - # ", ROP.s, " + '{:9.2f}'.format(ro.ro_pump.TBD) + # ", ROP.s, " + '{:9.2f}'.format(fp.ro_pump.TBD) pumpMeasSpds = ", BP.m, " + '{:7.1f}'.format(td.blood_flow.measured_blood_pump_speed) # ", BP.r, " + '{:6.1f}'.format(td.blood_flow.measured_blood_pump_rotor_speed) + \ # ", BP.f, " + '{:7.1f}'.format(td.blood_flow.measured_blood_flow_rate)