Index: tests/uf_test.py
===================================================================
diff -u -r4978a43b887c2611ccbc40714cb789ea362eef90 -rcd974f59a331830091dc9518dc217f03b1ebd969
--- tests/uf_test.py	(.../uf_test.py)	(revision 4978a43b887c2611ccbc40714cb789ea362eef90)
+++ tests/uf_test.py	(.../uf_test.py)	(revision cd974f59a331830091dc9518dc217f03b1ebd969)
@@ -40,7 +40,10 @@
         # collect UF related data from HD and DG
         while True:
             sleep(1)
-            pumpSetPts = "B.s," + str(hd.bloodflow.target_blood_flow_rate) + \
+            modes = "HD.m," + str(hd.hd_operation_mode) + \
+                ",DG.m," + str(dg.dg_operation_mode) + \
+                ",Dg.s," + str(dg.dg_operation_sub_mode)
+            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)
@@ -57,7 +60,7 @@
                 ",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)
+                ",DR.w," + str(dg.drain_pump.dac_value)
             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) + \
@@ -70,6 +73,7 @@
                 ",DRo," + str(dg.pressures.drain_pump_outlet_pressure)
 
             # log data
+            f.write(modes)
             f.write(pumpSetPts)
             f.write(pumpMeasSpds)
             f.write(pumpPWMs)
@@ -79,6 +83,7 @@
             f.write("\n")
 
             # print to console
+            print("          Modes: "+modes)
             print("Pump Set Points: "+pumpSetPts)
             print("    Pump Speeds: "+pumpMeasSpds)
             print(" Pump PWMs/DACs: "+pumpPWMs)