Index: tests/SeansUFTest.py
===================================================================
diff -u -r3a50e76b97f7f4e0ce2495ec132433f8de5cdf24 -rc05492f6a5c38e01bf555c1eb09b212e80ff3962
--- tests/SeansUFTest.py	(.../SeansUFTest.py)	(revision 3a50e76b97f7f4e0ce2495ec132433f8de5cdf24)
+++ tests/SeansUFTest.py	(.../SeansUFTest.py)	(revision c05492f6a5c38e01bf555c1eb09b212e80ff3962)
@@ -35,39 +35,47 @@
     sleep(1)
 
     # create log file
-    with open("SeansUFLog1.txt", "w") as f:
+    with open("SeansUFLog.txt", "w") as f:
 
         # collect UF related data from HD and DG
         while True:
             sleep(1)
-            pumpSetPts = "B," + str(hd.bloodflow.target_blood_flow_rate) + \
-                ",DI," + str(hd.dialysate_inlet_flow.target_dialysate_inlet_flow_rate) + \
-                ",DO,N/A,RO," + str(dg.ro_pump.target_pressure_psi) + \
-                ",DR," + str(dg.drain_pump.target_drain_pump_speed_RPM)
-            pumpMeasSpds = "B.m," + str(hd.bloodflow.measured_blood_pump_speed) + \
+            pumpSetPts = "B.s," + str(hd.bloodflow.target_blood_flow_rate) + \
+                ",DI.s," + str(hd.dialysate_inlet_flow.target_dialysate_inlet_flow_rate) + \
+                ",DO.s,N/A,RO.s," + str(dg.ro_pump.target_pressure_psi) + \
+                ",DR.s," + str(dg.drain_pump.target_drain_pump_speed_RPM)
+            pumpMeasSpds = ",B.m," + str(hd.bloodflow.measured_blood_pump_speed) + \
                 ",B.r," + str(hd.bloodflow.measured_blood_pump_rotor_speed) + \
+                ",B.f," + str(hd.bloodflow.measured_blood_flow_rate) + \
                 ",DI.m," + str(hd.dialysate_inlet_flow.measured_dialysate_inlet_pump_speed) + \
                 ",DI.r," + str(hd.dialysate_inlet_flow.measured_dialysate_inlet_pump_rotor_speed) + \
+                ",DI.f," + str(hd.dialysate_inlet_flow.measured_dialysate_inlet_flow_rate) + \
                 ",DO.m," + str(hd.dialysate_outlet_flow.measured_dialysate_outlet_pump_speed) + \
-                ",DO.r," + str(hd.dialysate_outlet_flow.measured_dialysate_outlet_pump_rotor_speed)
-            pumpPWMs = "B,"+str(hd.bloodflow.pwm_duty_cycle_pct) + \
-                ",DI," + str(hd.dialysate_inlet_flow.pwm_duty_cycle_pct) +  \
-                ",DO," + str(hd.dialysate_outlet_flow.pwm_duty_cycle_pct) + \
-                ",RO," + str(dg.ro_pump.pwm_duty_cycle_pct) + \
-                ",DR," + str(dg.drain_pump.dacValue)
-            loadCells = "A1," + str(dg.load_cells.load_cell_A1) + \
+                ",DO.r," + str(hd.dialysate_outlet_flow.measured_dialysate_outlet_pump_rotor_speed) + \
+                ",RO.f," + str(dg.ro_pump.measured_flow_rate_lpm)
+            pumpPWMs = ",B.w,"+str(hd.bloodflow.pwm_duty_cycle_pct) + \
+                ",DI.w," + str(hd.dialysate_inlet_flow.pwm_duty_cycle_pct) +  \
+                ",DO.w," + str(hd.dialysate_outlet_flow.pwm_duty_cycle_pct) + \
+                ",RO.w," + str(dg.ro_pump.pwm_duty_cycle_pct) + \
+                ",DR.w," + str(dg.drain_pump.dacValue)
+            loadCells = ",A1," + str(dg.load_cells.load_cell_A1) + \
                 ",B1," + str(dg.load_cells.load_cell_B1) + \
                 ",A2," + str(dg.load_cells.load_cell_A2) + \
                 ",B2," + str(dg.load_cells.load_cell_B2)
-            ultraFilt = "RfUF," + str(hd.dialysate_outlet_flow.reference_dialysate_outlet_uf_volume) + \
+            ultraFilt = ",RfUF," + str(hd.dialysate_outlet_flow.reference_dialysate_outlet_uf_volume) + \
                 ",MsUF," + str(hd.dialysate_outlet_flow.measured_dialysate_outlet_uf_volume)
+            dgPres = ",ROi," + str(dg.pressures.ro_pump_inlet_pressure) + \
+                ",ROo," + str(dg.pressures.ro_pump_outlet_pressure) + \
+                ",DRi," + str(dg.pressures.drain_pump_inlet_pressure) + \
+                ",DRo," + str(dg.pressures.drain_pump_outlet_pressure)
 
             # log data
             f.write(pumpSetPts)
             f.write(pumpMeasSpds)
             f.write(pumpPWMs)
             f.write(loadCells)
             f.write(ultraFilt)
+            f.write(dgPres)
             f.write("\n")
 
             # print to console
@@ -76,6 +84,7 @@
             print(" Pump PWMs/DACs: "+pumpPWMs)
             print("     Load Cells: "+loadCells)
             print("Ultrafiltration: "+ultraFilt)
+            print("   DG Pressures: "+dgPres)
 
 #    exit(1)