Index: dialin/ui/hd_simulator.py
===================================================================
diff -u -re485785be0282bc516d09c86f7e90b07c7ca03f1 -r3cfd47dcddb9ca34212ed9b7d29a76124c23044c
--- dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision e485785be0282bc516d09c86f7e90b07c7ca03f1)
+++ dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision 3cfd47dcddb9ca34212ed9b7d29a76124c23044c)
@@ -1481,8 +1481,3 @@
                                               payload=payload)
 
         self.can_interface.send(message, 0)
-
-
-
-
-
Index: tests/test_uf.py
===================================================================
diff -u -r47948eed572c352ffd10cd5246a145f2eec3266d -r3cfd47dcddb9ca34212ed9b7d29a76124c23044c
--- tests/test_uf.py	(.../test_uf.py)	(revision 47948eed572c352ffd10cd5246a145f2eec3266d)
+++ tests/test_uf.py	(.../test_uf.py)	(revision 3cfd47dcddb9ca34212ed9b7d29a76124c23044c)
@@ -18,6 +18,7 @@
 sys.path.append("..")
 from dialin.hd.hemodialysis_device import HD
 from dialin.dg.dialysate_generator import DG
+from dialin.dg.temperature_sensors import TemperatureSensorsNames
 from time import sleep
 
 if __name__ == "__main__":
@@ -76,19 +77,19 @@
                 ", 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) + \
+            dgPress = ", 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) + \
+            hdPress = ", 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)
-            Temps = ", TPi, " + '{:9.2f}'.format(dg.temperature_sensors.get_temperature(dg.temperature_sensors.TemperatureSensorsNames.INLET_PRIMARY_HEATER)) + \
-                ", TPo, " + '{:9.2f}'.format(dg.temperature_sensors.get_temperature(dg.temperature_sensors.TemperatureSensorsNames.OUTLET_PRIMARY_HEATER)) + \
-                ", TRo, " + '{:9.2f}'.format(dg.temperature_sensors.get_temperature(dg.temperature_sensors.TemperatureSensorsNames.INLET_DIALYSATE)) + \
-                ", TDi, " + '{:9.2f}'.format(dg.temperature_sensors.get_temperature(dg.temperature_sensors.TemperatureSensorsNames.OUTLET_DIALYSATE_REDUNDANT))
+            Temps = ", TPi, " + '{:9.2f}'.format(dg.temperature_sensors.get_temperature(TemperatureSensorsNames.INLET_PRIMARY_HEATER.name)) + \
+                ", TPo, " + '{:9.2f}'.format(dg.temperature_sensors.get_temperature(TemperatureSensorsNames.OUTLET_PRIMARY_HEATER.name)) + \
+                ", TRo, " + '{:9.2f}'.format(dg.temperature_sensors.get_temperature(TemperatureSensorsNames.INLET_DIALYSATE.name)) + \
+                ", TDi, " + '{:9.2f}'.format(dg.temperature_sensors.get_temperature(TemperatureSensorsNames.OUTLET_DIALYSATE_REDUNDANT.name))
             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) + \
@@ -109,10 +110,10 @@
             f.write(pumpSetPts)
             f.write(pumpMeasSpds)
             f.write(pumpPWMs)
-            f.write(dgPres)
+            f.write(dgPress)
             f.write(alarms)
             f.write(accels)
-            f.write(hdPres)
+            f.write(hdPress)
             f.write(Temps)
             f.write("\n")
 
@@ -124,8 +125,8 @@
             print("Pump Set Points: "+pumpSetPts)
             print("    Pump Speeds: "+pumpMeasSpds)
             print(" Pump PWMs/DACs: "+pumpPWMs)
-            print("   DG Pressures: "+dgPres)
-            print("   HD Pressures: "+hdPres)
+            print("   DG Pressures: "+dgPress)
+            print("   HD Pressures: "+hdPress)
             print("   Temperatures: "+Temps)
             print("  Accelerometer: "+accels)
             print("         Alarms: "+alarms)