Index: tests/dg_tests.py
===================================================================
diff -u -rb512a9393474d83243c08d7adf550540b2877f10 -r293a9792727fc7d9e87ee14055c19316a8f0c907
--- tests/dg_tests.py	(.../dg_tests.py)	(revision b512a9393474d83243c08d7adf550540b2877f10)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision 293a9792727fc7d9e87ee14055c19316a8f0c907)
@@ -79,8 +79,8 @@
         state_elapsed_time = dg.heat_disinfect.state_elapsed_time
     elif dg.dg_operation_mode == 12:
         state = DGHeatDisinfectActiveCoolStates(dg.heat_disinfect_active_cool.heat_disinfect_active_cool_state).name
-        state_elapsed_time = dg.heat_disinfect_active_cool.state_elapsed_time
         overall_elapsed_time = dg.heat_disinfect_active_cool.overall_elapsed_time
+        state_elapsed_time = dg.heat_disinfect_active_cool.state_elapsed_time
 
     info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_elapsed_time, {}, '
             'R1_level, {:5.3f}, R2_level, {:5.3f}, Top_alarm, {}, UI_state, {}, '
@@ -283,7 +283,7 @@
     info = ('Bicarb_curr_speed, {:5.3f}, Bicarb_speed, {:5.3f}, Acid_curr_speed, {:5.3f}, Acid_speed, {:5.3f}, '
             'CPo, {:5.3f}, CD1, {:5.3f}, CD2, {:5.3f}, CP1_state, {}, CP2_state, {}, CPi_status, {}, CPo_status, {}, '
             'CD1_status, {}, CD2_status, {}, CP1_pulse, {:5.3f}, CP2_pulse, {:5.3f}, Acid_tgt_speed, {:5.3f}, '
-            'Bicarb_tgt_speed, {:5.3f}, '
+            'Bicarb_tgt_speed, {:5.3f}, CP1_parked, {}, CP1_park_fault, {}, CP2_parked, {}, CP2_park_fault, {}, '
             .format(dg.concentrate_pumps.concentrate_pump_cp2_current_set_speed,
                     dg.concentrate_pumps.concentrate_pump_cp2_measured_speed,
                     dg.concentrate_pumps.concentrate_pump_cp1_current_set_speed,
@@ -296,7 +296,11 @@
                     dg.conductivity_sensors.cd1_sensor_status, dg.conductivity_sensors.cd2_sensor_status,
                     dg.concentrate_pumps.cp1_temp_pulse, dg.concentrate_pumps.cp2_temp_pulse,
                     dg.concentrate_pumps.concentrate_pump_cp1_target_speed,
-                    dg.concentrate_pumps.concentrate_pump_cp2_target_speed))
+                    dg.concentrate_pumps.concentrate_pump_cp2_target_speed,
+                    dg.concentrate_pumps.concentrate_pump_cp1_parked,
+                    dg.concentrate_pumps.concentrate_pump_cp1_park_fault,
+                    dg.concentrate_pumps.concentrate_pump_cp2_parked,
+                    dg.concentrate_pumps.concentrate_pump_cp2_park_fault))
     return info
 
 
@@ -473,8 +477,8 @@
     f = open("/home/fw/projects/dialin/tests/Heat_disinfect.log", "w")
     #dg.heaters.cmd_heaters_broadcast_interval_override(50)
     #sleep(1)
-    #dg.hd_proxy.cmd_start_stop_dg_heat_disinfect()
-    dg.hd_proxy.cmd_start_stop_dg_heat_disinfect_active_cool()
+    dg.hd_proxy.cmd_start_stop_dg_heat_disinfect()
+    #dg.hd_proxy.cmd_start_stop_dg_heat_disinfect_active_cool()
 
     try:
         while True:
@@ -647,7 +651,7 @@
     hd.cmd_log_in_to_hd()
     sleep(1)
 
-    run_heat_disinfect()
+    #run_heat_disinfect()
 
     #run_flush_mode()
 
@@ -657,7 +661,7 @@
 
     # cmd_set_disinfect_ui_screen()
 
-    #collect_treatment_data()
+    collect_treatment_data()
 
     #collect_hd_treatment()