Index: tests/test_uf.py
===================================================================
diff -u -r66c685d94ce9c85f6d4a3477f87bf245c50b1820 -r8a53de6c3b9d0ef76d2b4f648d2efc2d394cba21
--- tests/test_uf.py	(.../test_uf.py)	(revision 66c685d94ce9c85f6d4a3477f87bf245c50b1820)
+++ tests/test_uf.py	(.../test_uf.py)	(revision 8a53de6c3b9d0ef76d2b4f648d2efc2d394cba21)
@@ -47,6 +47,7 @@
         while True:
             sleep(1)
             modes = "HD.m, " + '{:2d}'.format(hd.hd_operation_mode) + \
+                ", HD.s, " + '{:2d}'.format(hd.hd_operation_sub_mode) + \
                 ", DG.m, " + '{:2d}'.format(dg.dg_operation_mode) + \
                 ", DG.s, " + '{:2d}'.format(dg.dg_operation_sub_mode)
             loadCells = ", A1, " + '{:8.1f}'.format(dg.load_cells.load_cell_A1) + \
@@ -57,28 +58,33 @@
                 ", 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)
-            pumpSetPts = ", B.s, " + '{:4d}'.format(hd.bloodflow.target_blood_flow_rate) + \
-                ", DI.s, " + '{:4d}'.format(hd.dialysate_inlet_flow.target_dialysate_inlet_flow_rate) + \
-                ", RO.s, " + '{:9.2f}'.format(dg.ro_pump.target_pressure_psi) + \
-                ", DR.s, " + '{:9.2f}'.format(dg.drain_pump.target_drain_pump_rpm)
-            pumpMeasSpds = ", B.m, " + '{:7.1f}'.format(hd.bloodflow.measured_blood_pump_speed) + \
-                ", B.r, " + '{:6.1f}'.format(hd.bloodflow.measured_blood_pump_rotor_speed) + \
-                ", B.f, " + '{:7.1f}'.format(hd.bloodflow.measured_blood_flow_rate) + \
-                ", DI.m, " + '{:7.1f}'.format(hd.dialysate_inlet_flow.measured_dialysate_inlet_pump_speed) + \
-                ", DI.r, " + '{:7.1f}'.format(hd.dialysate_inlet_flow.measured_dialysate_inlet_pump_rotor_speed) + \
-                ", DI.f, " + '{:7.1f}'.format(hd.dialysate_inlet_flow.measured_dialysate_inlet_flow_rate) + \
-                ", DO.m, " + '{:7.1f}'.format(hd.dialysate_outlet_flow.measured_dialysate_outlet_pump_speed) + \
-                ", DO.r, " + '{:6.1f}'.format(hd.dialysate_outlet_flow.measured_dialysate_outlet_pump_rotor_speed) + \
-                ", RO.f, " + '{:9.3f}'.format(dg.ro_pump.measured_flow_rate_lpm)
-            pumpPWMs = ", B.w, "+'{:6.1f}'.format(hd.bloodflow.pwm_duty_cycle_pct) + \
-                ", DI.w, " + '{:6.1f}'.format(hd.dialysate_inlet_flow.pwm_duty_cycle_pct) +  \
-                ", DO.w, " + '{:6.1f}'.format(hd.dialysate_outlet_flow.pwm_duty_cycle_pct) + \
-                ", RO.w, " + '{:6.1f}'.format(dg.ro_pump.pwm_duty_cycle_pct) + \
-                ", DR.w, " + '{:4d}'.format(dg.drain_pump.dac_value)
-            dgPres = ", ROi, " + '{:9.2f}'.format(dg.pressures.ro_pump_inlet_pressure) + \
-                ", ROo, " + '{:9.2f}'.format(dg.pressures.ro_pump_outlet_pressure) + \
-                ", DRi, " + '{:9.2f}'.format(dg.pressures.drain_pump_inlet_pressure) + \
-                     ", DRo, " + '{:9.2f}'.format(dg.pressures.drain_pump_outlet_pressure)
+            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) + \
+                ", DRP.s, " + '{:9.2f}'.format(dg.drain_pump.target_drain_pump_rpm)
+            pumpMeasSpds = ", BP.m, " + '{:7.1f}'.format(hd.bloodflow.measured_blood_pump_speed) + \
+                ", BP.r, " + '{:6.1f}'.format(hd.bloodflow.measured_blood_pump_rotor_speed) + \
+                ", BP.f, " + '{:7.1f}'.format(hd.bloodflow.measured_blood_flow_rate) + \
+                ", DPi.m, " + '{:7.1f}'.format(hd.dialysate_inlet_flow.measured_dialysate_inlet_pump_speed) + \
+                ", DPi.r, " + '{:7.1f}'.format(hd.dialysate_inlet_flow.measured_dialysate_inlet_pump_rotor_speed) + \
+                ", DPi.f, " + '{:7.1f}'.format(hd.dialysate_inlet_flow.measured_dialysate_inlet_flow_rate) + \
+                ", DPo.m, " + '{:7.1f}'.format(hd.dialysate_outlet_flow.measured_dialysate_outlet_pump_speed) + \
+                ", DPo.r, " + '{:6.1f}'.format(hd.dialysate_outlet_flow.measured_dialysate_outlet_pump_rotor_speed) + \
+                ", ROP.f, " + '{:9.3f}'.format(dg.ro_pump.measured_flow_rate_lpm)
+            pumpPWMs = ", BP.w, "+'{:6.1f}'.format(hd.bloodflow.pwm_duty_cycle_pct) + \
+                ", DPi.w, " + '{:6.1f}'.format(hd.dialysate_inlet_flow.pwm_duty_cycle_pct) +  \
+                ", DPo.w, " + '{:6.1f}'.format(hd.dialysate_outlet_flow.pwm_duty_cycle_pct) + \
+                ", ROP.w, " + '{:6.1f}'.format(dg.ro_pump.pwm_duty_cycle_pct) + \
+                ", DRP.w, " + '{:4d}'.format(dg.drain_pump.dac_value)
+            dgPres = ", PPi, " + '{:9.2f}'.format(dg.pressures.ro_pump_inlet_pressure) + \
+                ", PPo, " + '{:9.2f}'.format(dg.pressures.ro_pump_outlet_pressure) + \
+                ", PRd, " + '{:9.2f}'.format(dg.pressures.drain_pump_inlet_pressure) + \
+                ", PDr, " + '{:9.2f}'.format(dg.pressures.drain_pump_outlet_pressure)
+            hdPres = ", PBA, " + '{:9.2f}'.format(hd.pressure_occlusion.arterial_pressure) + \
+                ", PBV, " + '{:9.2f}'.format(hd.pressure_occlusion.venous_pressure) + \
+                ", OB, " + '{:7d}'.format(hd.pressure_occlusion.blood_pump_occlusion) + \
+                ", ODi, " + '{:7d}'.format(hd.pressure_occlusion.dialysate_inlet_pump_occlusion) + \
+                ", ODo, " + '{:7d}'.format(hd.pressure_occlusion.dialysate_outlet_pump_occlusion)
             alarms = ", AL.s, " + hd.alarms.get_current_alarms_state() + \
                 ", AL.t, " + '{:4d}'.format(hd.alarms.alarm_top)
             accels = ", AC.x, " + '{:9.4f}'.format(hd.accel.get_accel_vector().x) + \
@@ -91,7 +97,7 @@
                 ", ACt.y, " + '{:9.4f}'.format(hd.accel.get_accel_tilts().y) + \
                 ", ACt.z, " + '{:9.4f}'.format(hd.accel.get_accel_tilts().z)
 
-                # log data
+            # log data
             f.write(modes)
             f.write(loadCells)
             f.write(ultraFilt)
@@ -102,6 +108,7 @@
             f.write(dgPres)
             f.write(alarms)
             f.write(accels)
+            f.write(hdPres)
             f.write("\n")
 
             # print to console
@@ -113,6 +120,7 @@
             print("    Pump Speeds: "+pumpMeasSpds)
             print(" Pump PWMs/DACs: "+pumpPWMs)
             print("   DG Pressures: "+dgPres)
+            print("   HD Pressures: "+hdPres)
             print("  Accelerometer: "+accels)
             print("         Alarms: "+alarms)