Index: tests/dg_tests.py
===================================================================
diff -u -r63b4319afbaac8d4e6df4eb62978d201d81bd6e8 -r183a3606fd69f41a1f53a31e2e6a001810c48bd6
--- tests/dg_tests.py	(.../dg_tests.py)	(revision 63b4319afbaac8d4e6df4eb62978d201d81bd6e8)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision 183a3606fd69f41a1f53a31e2e6a001810c48bd6)
@@ -141,7 +141,7 @@
 
 def get_dg_valves_states():
     info = ('VPi, {}, VSP, {}, VPd, {}, VBf, {}, VPo, {}, VDr, {}, VRc, {}, VRo, {}, VRd, {}, VRi, {}, VRf, {}, '
-            'VRD1, {}, VRD2, {}, All, {}, '
+            'VRD1, {}, VRD2, {}, '
             .format(dg.valves.valve_states_enum[dg.valves.VALVE_PRESSURE_INLET],
                     dg.valves.valve_states_enum[dg.valves.VALVE_SAMPLING_PORT],
                     dg.valves.valve_states_enum[dg.valves.VALVE_PRODUCTION_DRAIN],
@@ -154,8 +154,7 @@
                     dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_INLET],
                     dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_FILL],
                     dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_DRAIN_1],
-                    dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_DRAIN_2],
-                    dg.valves.valves_sensed_states))
+                    dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_DRAIN_2]))
     return info
 
 
@@ -201,8 +200,7 @@
     info = ('Pri_main_DC, {:5.3f}, Pri_state, {}, Trimmer_DC, {:5.3f}, Trimmer_state, {}, '
             'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, Primary_eff, {:5.3f}, '
             'Primary_calc_temp, {:5.3f}, Trimmer_calc_temp, {:5.3f}, Primary_power, {:5.3f}, '
-            'Primary_volt, {:5.3f}, Primary_sec_volt, {:5.3f},'
-            ' Trimmer_volt, {:5.3f}, '
+            'Primary_volt, {:5.3f}, Primary_sec_volt, {:5.3f}, Trimmer_volt, {:5.3f}, Trimmer_use_last_dc, {}, '
             .format(dg.heaters.main_primary_heater_duty_cycle, dg.heaters.primary_heater_state,
                     dg.heaters.trimmer_heater_duty_cycle, dg.heaters.trimmer_heater_state,
                     dg.heaters.primary_heaters_target_temperature, dg.heaters.trimmer_heater_target_temperature,
@@ -211,7 +209,8 @@
                     dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_POWER_PRIM_HTR_V.value],
                     dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_GND_MAIN_PRIM_HTR_V.value],
                     dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_GND_SMALL_PRIM_HTR_V.value],
-                    dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_GND_TRIM_HTR_V.value]))
+                    dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_GND_TRIM_HTR_V.value],
+                    dg.heaters.trimmer_use_last_duty_cycle))
     return info
 
 
@@ -436,9 +435,10 @@
             fill_info = get_dg_fill_info()
             idle_bad_fill = get_dg_idle_bad_fill_info()
             uv = get_uv_reactors_info()
+            hd_fans = get_hd_fans_info()
 
             var = str(datetime.now()) + ', ' + hd_run + dg_run + hd_rsrvrs + dg_rsrvrs + load_cell + drain + ro + \
-                  temp + heaters + conc_pumps + dg_fans + valves + blood_leak + hd_pumps + fill_info + uv + '\r'
+                temp + heaters + conc_pumps + dg_fans + valves + blood_leak + hd_pumps + fill_info + uv + hd_fans + '\r'
 
             if hd.alarms.get_alarm_state(97) and start is False:
                 dg.conductivity_sensors.cmd_conductivity_sensor_override(ConductivitySensorsEnum.CD2.value, 13700.00)
@@ -698,12 +698,12 @@
 
     # cmd_set_disinfect_ui_screen()
 
-    #collect_treatment_data()
+    collect_treatment_data()
 
     #collect_hd_treatment()
 
     #while True:
-    #    print(get_temperature_sensors_info(), get_dg_fans_info())
+    #    print(get_hd_fans_info(), get_dg_fans_info())
     #    sleep(1)
 
     #while True:
@@ -735,10 +735,10 @@
     #sleep(1)
     #dg.heaters.cmd_start_stop_trimmer_heater(0)
 
-    dg.valves.cmd_valve_sensed_state_override(4, 1, reset=0)
+    #dg.valves.cmd_valve_sensed_state_override(4, 1, reset=0)
 
-    while True:
-        print(get_dg_valves_states())
-        sleep(1)
+    #while True:
+    #    print(get_dg_valves_states())
+    #    sleep(1)