Index: tests/test_uf.py
===================================================================
diff -u -r1076daa37cc911c27a2a4ff789a8b91cb7de08ce -r69fc37ca34f89229ceb18cf691dd4717d29032c8
--- tests/test_uf.py	(.../test_uf.py)	(revision 1076daa37cc911c27a2a4ff789a8b91cb7de08ce)
+++ tests/test_uf.py	(.../test_uf.py)	(revision 69fc37ca34f89229ceb18cf691dd4717d29032c8)
@@ -18,6 +18,7 @@
 sys.path.append("..")
 from dialin.hd.hemodialysis_device import HD
 from dialin.dg.dialysate_generator import DG
+from dialin.hd.valves import ValvesEnum
 from dialin.dg.temperatures import DGTemperaturesNames
 from time import sleep
 
@@ -58,7 +59,15 @@
             ultraFilt = ", RfUF, " + '{:9.2f}'.format(hd.dialysate_outlet_flow.reference_dialysate_outlet_uf_volume) + \
                 ", MsUF, " + '{:9.2f}'.format(hd.dialysate_outlet_flow.measured_dialysate_outlet_uf_volume) + \
                 ", Act.Res, " + '{:1d}'.format(dg.reservoirs.active_reservoir)
-            valves = ", Vlv, " + '{:4X}'.format(dg.valves.valve_states_all)
+            valves = ", DGVlvs, " + '{:4X}'.format(dg.valves.valve_states_all) + \
+                ", VBA, " + hd.valves.valves_status[ValvesEnum.VBA.name]["PosID"] + \
+                ", VBV, " + hd.valves.valves_status[ValvesEnum.VBV.name]["PosID"] + \
+                ", VDi, " + hd.valves.valves_status[ValvesEnum.VDI.name]["PosID"] + \
+                ", VDo, " + hd.valves.valves_status[ValvesEnum.VDO.name]["PosID"] + \
+                ", VBT, " + hd.valves.hd_air_trap_status
+            air = ", ADV, " + '{:1d}'.format(hd.air_bubbles.air_bubbles_status[0]) + \
+                ", ULBl, " + '{:1d}'.format(hd.air_trap.lower_level) + \
+                ", ULBu, " + '{:1d}'.format(hd.air_trap.upper_level)
             pumpSetPts = ", BP.s, " + '{:4d}'.format(hd.bloodflow.target_blood_flow_rate) + \
                 ", DPi.s, " + '{:4d}'.format(hd.dialysate_inlet_flow.target_dialysate_inlet_flow_rate) + \
                 ", ROP.s, " + '{:9.2f}'.format(dg.ro_pump.target_pressure_psi) + \
@@ -123,6 +132,7 @@
             f.write(hdPress)
             f.write(Temps)
             f.write(htrs)
+            f.write(air)
             f.write("\n")
 
             # print to console
@@ -137,6 +147,7 @@
             print("   HD Pressures: "+hdPress)
             print("     DG Heaters: "+htrs)
             print("   Temperatures: "+Temps)
+            print("            Air: "+air)
             print("  Accelerometer: "+accels)
             print("         Alarms: "+alarms)