Index: tests/uf_test.py
===================================================================
diff -u -re97c499a943e83a39b0c1b41a7d41b706001253d -r55fd0b9d7fffc7f915da25c2a3e274e426739aa5
--- tests/uf_test.py	(.../uf_test.py)	(revision e97c499a943e83a39b0c1b41a7d41b706001253d)
+++ tests/uf_test.py	(.../uf_test.py)	(revision 55fd0b9d7fffc7f915da25c2a3e274e426739aa5)
@@ -40,37 +40,41 @@
         # collect UF related data from HD and DG
         while True:
             sleep(1)
-            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)
-            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) + \
-                ",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.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) + \
-                ",B2," + str(dg.load_cells.load_cell_B2)
-            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)
+            modes = "HD.m, " + '{:2d}'.format(hd.hd_operation_mode) + \
+                ", DG.m, " + '{:2d}'.format(dg.dg_operation_mode) + \
+                ", Dg.s, " + '{:2d}'.format(dg.dg_operation_sub_mode)
+            pumpSetPts = ", B.s, " + '{:4d}'.format(hd.bloodflow.target_blood_flow_rate) + \
+                ", DI.s, " + '{:4d}'.format(hd.dialysate_inlet_flow.target_dialysate_inlet_flow_rate) + \
+                ", DO.s, N/A" + \
+                ", RO.s, " + '{:4d}'.format(dg.ro_pump.target_pressure_psi) + \
+                ", DR.s, " + '{:5d}'.format(dg.drain_pump.target_drain_pump_speed_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, " + '{:7.1f}'.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)
+            loadCells = ", A1, " + '{:8.1f}'.format(dg.load_cells.load_cell_A1) + \
+                ", B1, " + '{:8.1f}'.format(dg.load_cells.load_cell_B1) + \
+                ", A2, " + '{:8.1f}'.format(dg.load_cells.load_cell_A2) + \
+                ", B2, " + '{:8.1f}'.format(dg.load_cells.load_cell_B2)
+            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)
+            dgPres = ", ROi, " + '{:8.1f}'.format(dg.pressures.ro_pump_inlet_pressure) + \
+                ", ROo, " + '{:8.1f}'.format(dg.pressures.ro_pump_outlet_pressure) + \
+                ", DRi, " + '{:8.1f}'.format(dg.pressures.drain_pump_inlet_pressure) + \
+                ", DRo, " + '{:8.1f}'.format(dg.pressures.drain_pump_outlet_pressure)
+            alarms = ", AL.s, " + hd.alarms.getCurrentAlarmsState() + \
+                ", AL.t, " + '{:4d}'.format(hd.alarms.alarm_top)
 
             # log data
             f.write(modes)