Index: tests/test_uf.py
===================================================================
diff -u -r1b768bf4593cd29f00a5e07546c3e7b16d7a646c -rd23b6e2d83f29c9eeec1d2f284a00eb312ca6fe5
--- tests/test_uf.py	(.../test_uf.py)	(revision 1b768bf4593cd29f00a5e07546c3e7b16d7a646c)
+++ tests/test_uf.py	(.../test_uf.py)	(revision d23b6e2d83f29c9eeec1d2f284a00eb312ca6fe5)
@@ -86,10 +86,10 @@
                 ", 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(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))
+            Temps = ", TPi, " + '{:9.2f}'.format(dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.INLET_PRIMARY_HEATER.name]) + \
+                ", TPo, " + '{:9.2f}'.format(dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.OUTLET_PRIMARY_HEATER.name]) + \
+                ", TRo, " + '{:9.2f}'.format(dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.INLET_DIALYSATE.name]) + \
+                ", TDi, " + '{:9.2f}'.format(dg.temperature_sensors.temperature_sensors[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) + \
@@ -101,6 +101,11 @@
                 ", ACt.x, " + '{:9.4f}'.format(hd.accel.get_accel_tilts().x) + \
                 ", ACt.y, " + '{:9.4f}'.format(hd.accel.get_accel_tilts().y) + \
                 ", ACt.z, " + '{:9.4f}'.format(hd.accel.get_accel_tilts().z)
+            htrs = ('Pri_main_DC, {:5.3f}, Pri_small_DC, {:5.3f}, Trimmer_DC, {:5.3f}, '
+                    'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, '.
+                    format(dg.heaters.main_primary_heater_duty_cycle, dg.heaters.small_primary_heater_duty_cycle,
+                           dg.heaters.trimmer_heater_duty_cycle,
+                           dg.heaters.primary_heaters_target_temperature, dg.heaters.trimmer_heater_target_temperature))
 
             # log data
             f.write(modes)
@@ -115,6 +120,7 @@
             f.write(accels)
             f.write(hdPress)
             f.write(Temps)
+            f.write(htrs)
             f.write("\n")
 
             # print to console
@@ -127,6 +133,7 @@
             print(" Pump PWMs/DACs: "+pumpPWMs)
             print("   DG Pressures: "+dgPress)
             print("   HD Pressures: "+hdPress)
+            print("     DG Heaters: "+htrs)
             print("   Temperatures: "+Temps)
             print("  Accelerometer: "+accels)
             print("         Alarms: "+alarms)
Index: tests/test_voltages.py
===================================================================
diff -u -r0672e22226aee86ce63dd4f42968c3071e89b652 -rd23b6e2d83f29c9eeec1d2f284a00eb312ca6fe5
--- tests/test_voltages.py	(.../test_voltages.py)	(revision 0672e22226aee86ce63dd4f42968c3071e89b652)
+++ tests/test_voltages.py	(.../test_voltages.py)	(revision d23b6e2d83f29c9eeec1d2f284a00eb312ca6fe5)
@@ -29,13 +29,13 @@
     dg = DG()
 
     # log in to HD and DG as tester
-    if hd.cmd_log_in_to_hd() == 0:
-        print("Failed to log into HD.")
-        exit(1)
-    if dg.cmd_log_in_to_dg() == 0:
-        print("Failed to log into DG.")
-        exit(1)
-    sleep(0.1)
+#    if hd.cmd_log_in_to_hd() == 0:
+#        print("Failed to log into HD.")
+#        exit(1)
+#    if dg.cmd_log_in_to_dg() == 0:
+#        print("Failed to log into DG.")
+#        exit(1)
+#    sleep(0.1)
 
 #    hd.rtc.cmd_set_rtc_time_and_date(0,0,9,7,5,2021)
 #    exit(1)
@@ -56,11 +56,10 @@
         # write monitored voltages related data from HD to log file
         while True:
             x = x + 1
-            if x == 40:
-                hd.alarms.cmd_alarm_backup_audio_current_override(0.0,NO_RESET)
-            if x == 80:
-                hd.watchdog.cmd_watchdog_task_check_in_override(0,1,NO_RESET)
-            sleep(0.05)
+#            if x == 40:
+#                hd.alarms.cmd_alarm_backup_audio_current_override(0.0,NO_RESET)
+#            if x == 80:
+#                hd.watchdog.cmd_watchdog_task_check_in_override(0,1,NO_RESET)
             vHd = hd.voltages.get_monitored_voltages()
             vDg = dg.voltages.get_monitored_voltages()
             hdVoltageData = '{:11.6f}'.format(vHd[HDMonitoredVoltages.MONITORED_LINE_1_2V.value]) + \
@@ -89,6 +88,7 @@
                 ", " + '{:11.6f}'.format(vDg[DGMonitoredVoltages.MONITORED_LINE_24V_MAIN.value]) + \
                 ", " + '{:11.6f}'.format(vDg[DGMonitoredVoltages.MONITORED_LINE_24V_PRIM_HTR_V.value]) + \
                 ", " + '{:11.6f}'.format(vDg[DGMonitoredVoltages.MONITORED_LINE_24V_TRIM_HTR_V.value])
+            sleep(0.05)
 
             # log data
             f.write(hdVoltageData+dgVoltageData+"\n")