Index: tests/dg_heat_and_chemical_disinfect_test.py
===================================================================
diff -u -r1076daa37cc911c27a2a4ff789a8b91cb7de08ce -rbaf6c6eb48eeab63238a8b44c188d2c37f63ecc0
--- tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision 1076daa37cc911c27a2a4ff789a8b91cb7de08ce)
+++ tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision baf6c6eb48eeab63238a8b44c188d2c37f63ecc0)
@@ -93,6 +93,18 @@
     return info
 
 
+def get_dg_reservoirs_info():
+    info = ('Time_rsrvr_cycle, {}, Time_rsrvr_fill_2_switch, {}, Time_uf_decay, {:5.3f}, Temp_uf_fill, {:5.3f}, '
+            'Temp_rsrvr_use_actual, {:5.3f}, Temp_rsrvr_end_fill, {:5.3}, Temp_avg_fill, {:5.3f}, '
+            'Temp_last_fill, {:5.3f}, Time_rsrvr_fill, {:5.3f},  '.format(dg.reservoirs.time_reservoir_cycle,
+                                                dg.reservoirs.time_reservoir_fill_2_switch,
+                                                dg.reservoirs.time_uf_decay, dg.reservoirs.temp_uf_fill,
+                                                dg.reservoirs.temp_reservoir_use_actual,
+                                                dg.reservoirs.temp_reservoir_end_fill, dg.reservoirs.temp_avg_fill,
+                                                dg.reservoirs.temp_last_fill, dg.reservoirs.time_rsrvr_fill))
+    return info
+
+
 def get_dg_run_info():
     # info = ('DG_op_mode, {}, DG_sub_mode, {}, Op, {}, Sub, {}, '.format(DGOperationModes(dg.dg_operation_mode).name,
     #                                                                 dg.dg_operation_sub_mode,
@@ -149,21 +161,23 @@
 
 
 def get_heaters_with_no_temp_info():
-    info = ('Pri_main_DC, {:5.3f}, Pri_small_DC, {:5.3f}, Pri_state, {}, Trimmer_DC, {:5.3f}, '
+    info = ('Pri_main_DC, {:5.3f}, Pri_state, {}, Trimmer_DC, {:5.3f}, Trim_state, {}, '
             '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.primary_heater_state, dg.heaters.trimmer_heater_duty_cycle,
+            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))
     return info
 
 
 def get_heaters_info():
-    info = ('Pri_main_DC, {:5.3f}, Pri_small_DC, {:5.3f}, Pri_state, {}, Trimmer_DC, {:5.3f}, '
-            'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, Primary_eff, {:5.3f}, '.
-            format(dg.heaters.main_primary_heater_duty_cycle, dg.heaters.small_primary_heater_duty_cycle,
-                   dg.heaters.primary_heater_state, dg.heaters.trimmer_heater_duty_cycle,
+    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}, Dia_flow, {:5.3f}, '
+            'Interim_int_temp, {:5.3f}, Heater_RO_flow, {:5.3f}, '.
+            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,
-                   dg.heaters.primary_efficiency))
+                   dg.heaters.primary_efficiency, dg.heaters.temporary_remove_flow,
+                   dg.heaters.temporary_internal_target, dg.heaters.temporary_target_ro_flow))
     return info
 
 
@@ -212,6 +226,19 @@
     return info
 
 
+def get_concentrate_pumps_info():
+
+    info = ('Bicarb_tgt_speed, {:5.3f}, Bicarb_speed, {:5.3f}, Acid_tgt_speed, {:5.3f}, Acid_speed, {:5.3f}, '
+            'CPo, {:5.3f}, CD1, {:5.3f}, CD2, {:5.3f}, '
+            .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,
+                    dg.concentrate_pumps.concentrate_pump_cp1_measured_speed,
+                    dg.conductivity_sensors.conductivity_sensor_cpo, dg.conductivity_sensors.conductivity_sensor_cd1,
+                    dg.conductivity_sensors.conductivity_sensor_cd2))
+    return info
+
+
 def cmd_test_heaters():
     f = open("/home/fw/projects/dialin/tests/test_heaters.log", "w")
 
@@ -451,6 +478,7 @@
         while True:
             hd_run = get_hd_run_info()
             hd_rsrvrs = get_hd_reservoirs_info()
+            dg_rsrvrs = get_dg_reservoirs_info()
             dg_run = get_dg_run_info()
             drain = get_drain_states_info()
             load_cell = get_load_cells_info()
@@ -459,9 +487,10 @@
             temp = get_temperature_sensors_info()
             heaters = get_heaters_info()
             dg_fans = get_dg_fans_info()
+            conc_pumps = get_concentrate_pumps_info()
 
-            var = str(datetime.now()) + ', ' + hd_run + dg_run + hd_rsrvrs + load_cell + drain + ro + temp + heaters + \
-                dg_fans + valves + '\r'
+            var = str(datetime.now()) + ', ' + hd_run + dg_run + hd_rsrvrs + dg_rsrvrs + load_cell + drain + ro + \
+                temp + heaters + conc_pumps + dg_fans + valves + '\r'
 
             print(var)
             f.write(var)
@@ -588,7 +617,7 @@
     hd.cmd_log_in_to_hd()
     sleep(1)
 
-    run_heat_disinfect()
+    # run_heat_disinfect()
 
     # run_chemical_disinfect()
 
@@ -600,9 +629,9 @@
 
     # cmd_test_heaters()
 
-    # collect_treatment_data()
+    collect_treatment_data()
 
-    #collect_hd_treatment()
+    # collect_hd_treatment()