Index: tests/dg_heat_and_chemical_disinfect_test.py
===================================================================
diff -u -rb70eb3eb8264ba114ee8ddb968c697ac7da5b4e9 -rd2f5856e101a17d9bbb3098f3137ac7e0da918ef
--- tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision b70eb3eb8264ba114ee8ddb968c697ac7da5b4e9)
+++ tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision d2f5856e101a17d9bbb3098f3137ac7e0da918ef)
@@ -29,6 +29,8 @@
 from dialin.common.hd_defs import HDOpModes, HDOpSubModes
 from dialin.common.dg_defs import DGEventList
 from dialin.common.hd_defs import HDEventList
+from dialin.hd.reservoirs import HDReservoirStates
+from dialin.dg.reservoirs import DGReservoirsNames
 from time import sleep
 from datetime import datetime
 import sys
@@ -71,13 +73,23 @@
 
 
 def get_hd_run_info():
-    info = ('HD_op_mode, {}, HD_sub_mode, {}, Op, {}, Sub, {}, '.format(HDOpModes(hd.hd_operation_mode).name,
-                                                                        hd.hd_operation_sub_mode,
-                                                                        hd.hd_events.get_hd_events(HDEventList(1).value),
-                                                                        hd.hd_events.get_hd_events(HDEventList(2).value)))
+    info = ('HD_op_mode, {}, HD_sub_mode, {}, Top_alarm, {}, '
+            .format(HDOpModes(hd.hd_operation_mode).name, hd.hd_operation_sub_mode, hd.alarms.alarm_top))
     return info
 
 
+def get_hd_reservoirs_info():
+    info = ('HD_rsrvr_state, {}, Active_rsrvr, {}, Active_rsrvr_uf, {:5.3f}, Active_rsrvr_vol_spent, {:5.3f}, '
+            'Dilution_level_pct, {:5.3f}, Recirc_level_pct, {:5.3f}, Time_depletion, {}, Time_wait_to_fill, {}, '
+            'Target_fill_flow, {:5.3f}, '
+            .format(HDReservoirStates(hd.hd_reservoirs.reservoir_state).name,
+                    DGReservoirsNames(dg.reservoirs.active_reservoir).name, hd.hd_reservoirs.active_reservoir_uf_ml,
+                    hd.hd_reservoirs.active_reservoir_spent_vol_ml, hd.hd_reservoirs.dilution_level_pct,
+                    hd.hd_reservoirs.recirculation_level_pct, hd.hd_reservoirs.time_depletion,
+                    hd.hd_reservoirs.time_wait_to_fill, hd.hd_reservoirs.temp_remove_fill_flow))
+    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,
@@ -125,10 +137,10 @@
 
 
 def get_ro_info():
-    info = ('RO, {}, PPi, {:5.3f}, PPo, {:5.3f}, PWM, {:5.3f}, Flow, {:5.3f}, Tgt_flow, {:5.3f}, '
+    info = ('RO, {}, PPi, {:5.3f}, PPo, {:5.3f}, PWM, {:5.3f}, Flow, {:5.3f}, Tgt_flow, {:5.3f}, Dia_flow, {:5.3f}, '
             .format(dg.ro_pump.ro_pump_state, dg.pressures.ro_pump_inlet_pressure,
                     dg.pressures.ro_pump_outlet_pressure, dg.ro_pump.pwm_duty_cycle_pct,
-                    dg.ro_pump.measured_flow_rate_lpm, dg.ro_pump.target_flow_lpm))
+                    dg.ro_pump.measured_flow_rate_lpm, dg.ro_pump.target_flow_lpm, dg.dialysate_flow_sensor.flow_rate))
     return info
 
 
@@ -434,6 +446,7 @@
     try:
         while True:
             hd_run = get_hd_run_info()
+            hd_rsrvrs = get_hd_reservoirs_info()
             dg_run = get_dg_run_info()
             drain = get_drain_states_info()
             load_cell = get_load_cells_info()
@@ -443,8 +456,8 @@
             heaters = get_heaters_info()
             dg_fans = get_dg_fans_info()
 
-            var = str(datetime.now()) + ', ' + hd_run + dg_run + load_cell + drain + ro + temp + heaters + dg_fans + \
-                  valves + '\r'
+            var = str(datetime.now()) + ', ' + hd_run + dg_run + hd_rsrvrs + load_cell + drain + ro + temp + heaters + \
+                dg_fans + valves + '\r'
 
             print(var)
             f.write(var)
@@ -575,7 +588,7 @@
 
     # run_chemical_disinfect()
 
-    run_dg()
+    # run_dg()
 
     # run_ro_pump_duty_cycles()
 
@@ -585,7 +598,7 @@
 
     # cmd_test_heaters()
 
-    #collect_treatment_data()
+    collect_treatment_data()
 
     #collect_hd_treatment()