Index: tests/test_uf.py
===================================================================
diff -u -rb9ba64273bb19c12ab9dcd4dd5dc65d7f0b59e47 -re2c8f084b074e0202555895f93a2cfff1fd52f3d
--- tests/test_uf.py	(.../test_uf.py)	(revision b9ba64273bb19c12ab9dcd4dd5dc65d7f0b59e47)
+++ tests/test_uf.py	(.../test_uf.py)	(revision e2c8f084b074e0202555895f93a2cfff1fd52f3d)
@@ -22,32 +22,7 @@
 #from leahi_dialin.dd.dialysate_delivery import DD
 #from leahi_dialin.ro.reverse_osmosis import RO
 
-# from leahi_dialin.td.modules.air_pump import TDAirPump
-# from leahi_dialin.td.modules.air_trap import AirTrapValves
-# from leahi_dialin.td.modules.air_trap import AirTrapState
-# from leahi_dialin.td.modules.air_trap import TDAirTrap
-#
-# from leahi_dialin.td.modules.alarms import TDAlarms
-#
-# from leahi_dialin.td.modules.blood_flow import TDBloodFlow
-#
-# from leahi_dialin.td.modules.bubble_detector import TDBubbleDectector
-#
-# from leahi_dialin.td.modules.buttons import TDButtons
-#
-# from leahi_dialin.td.modules.pressure_sensors import TDPressureSensors
-#
-# from leahi_dialin.td.modules.switches import TDSwitchStatus
-# from leahi_dialin.td.modules.switches import TDSwitchesNames
-# from leahi_dialin.td.modules.switches import TDSwitches
-#
 from leahi_dialin.td.modules.valves import ValvesEnum
-# from leahi_dialin.td.modules.valves import ValvesPositions
-# from leahi_dialin.td.modules.valves import ValvesStates
-# from leahi_dialin.td.modules.valves import TDValves
-#
-# from leahi_dialin.td.modules.voltages import TDMonitoredVoltages
-# from leahi_dialin.td.modules.voltages import TDVoltages
 
 if __name__ == "__main__":
     # create an TD object called td
@@ -67,8 +42,11 @@
 #        exit(1)
 #    sleep(1)
 
+    # send command to show round-trip communication w/ firmware is working
+    td.blood_flow.cmd_blood_flow_set_speed_rate_request(100)
+
     # create log file
-    with open("UF_test.log", "w") as f:
+    with open("TD_test.log", "w") as f:
 
         # collect data and display/log it
         while True:
@@ -77,8 +55,9 @@
                 ", TD.s, " + '{:2d}'.format(td.td_operation_sub_mode)
                 # ", DD.m, " + '{:2d}'.format(dd.dd_operation_mode) + \
                 # ", DD.s, " + '{:2d}'.format(dd.dd_operation_sub_mode)
-            pumpSetPts = ", BP.s, " + '{:4d}'.format(td.blood_flow.target_blood_flow_rate)
-                # ", ROP.s, " + '{:9.2f}'.format(ro.ro_pump.target_pressure_psi)
+            pumpSetPts = ", BP.sf, " + '{:4d}'.format(td.blood_flow.target_blood_flow_rate) + \
+                         ", BP.ss, " + '{:9.2f}'.format(td.blood_flow.set_rpm)
+                # ", ROP.s, " + '{:9.2f}'.format(ro.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)
@@ -89,8 +68,8 @@
             air = ", ADV, " + '{:1d}'.format(td.bubbles.air_bubbles_status) + \
                 ", ULBl, " + '{:1d}'.format(td.air_trap.lower_level) + \
                 ", ULBu, " + '{:1d}'.format(td.air_trap.upper_level) + \
-                ", AP, " + '{:1d}'.format(td.air_pump.air_pump_state)
-                # ", VBT, " + '{:1d}'.format(td.air_trap.)
+                ", AP, " + '{:1d}'.format(td.air_pump.air_pump_state) + \
+                ", VBT, " + '{:1d}'.format(td.air_trap.valve_state)
             alarms = ", AL.s, " + '{:1d}'.format(td.alarms.get_current_alarms_state()) + \
                 ", AL.t, " + '{:4d}'.format(td.alarms.alarm_top)