Index: tests/dg_tests.py
===================================================================
diff -u -rffc3be28e8a1d3e654e152671eddfe8bc205ba5e -r561e833a27bde8d147f7966cb472671c1760d28d
--- tests/dg_tests.py	(.../dg_tests.py)	(revision ffc3be28e8a1d3e654e152671eddfe8bc205ba5e)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision 561e833a27bde8d147f7966cb472671c1760d28d)
@@ -171,14 +171,22 @@
 
 def get_ro_info():
     info = ('RO, {}, PPi, {:5.3f}, PPo, {:5.3f}, PWM, {:5.3f}, Flow, {:5.3f}, Tgt_flow, {:5.3f}, Dia_flow, {:5.3f}, '
-            'Feedback_PWM, {:5.3f}, flow_with_conc_pumps, {:5.3f}, '
+            'Feedback_PWM, {:5.3f}, Flow_with_conc_pumps, {:5.3f}, Dialysate_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.dialysate_flow_sensor.flow_rate,
-                    dg.ro_pump.feedback_duty_cycle_pct, dg.ro_pump.measured_raw_flow_rate_with_conc_pumps_mlp))
+                    dg.ro_pump.feedback_duty_cycle_pct, dg.ro_pump.measured_raw_flow_rate_with_conc_pumps_mlp,
+                    dg.dialysate_flow_sensor.flow_rate))
     return info
 
 
+def get_new_ro_info():
+    info = ('New_flow, {:5.3f}, Tgt_flow, {:5.3f}, New_flow_with_conc_pumps, {:5.3f}, New_dialysate_flow, {:5.3f}, '
+            .format(dg.dialysate_flow_sensor.new_ro_flow, dg.dialysate_flow_sensor.new_dialysate_flow,
+                    dg.dialysate_flow_sensor.new_ro_flow_with_conc,          dg.dialysate_flow_sensor.new_dialysate_flow))
+    return info
+
+
 def get_heaters_with_no_temp_info():
     info = ('Pri_main_DC, {:5.3f}, Pri_state, {}, Trimmer_DC, {:5.3f}, Trim_state, {}, '
             'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, '.
@@ -191,14 +199,14 @@
 def get_heaters_info():
     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_volt, {:5.3f}, Trimmer_volt, {: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_heaters_target_temperature,
-                   dg.heaters.trimmer_calc_target_temperature,
-                   dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_PRIM_HTR_V.value],
-                   dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_TRIM_HTR_V.value]))
+            'Primary_calc_temp, {:5.3f}, Trimmer_calc_temp, {:5.3f}, Primary_volt, {:5.3f}, Trimmer_volt, {: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_heaters_target_temperature,
+                    dg.heaters.trimmer_calc_target_temperature,
+                    dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_PRIM_HTR_V.value],
+                    dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_TRIM_HTR_V.value]))
     return info
 
 
@@ -313,9 +321,9 @@
     f = open("/home/fw/projects/dialin/tests/run_dg.log", "w")
 
     dg.hd_proxy.cmd_start_stop_dg()
-    sleep(0.1)
+    sleep(1)
 
-    dg.hd_proxy.cmd_switch_reservoirs(reservoir_id=1)
+    dg.heaters.cmd_start_stop_primary_heater()
     sleep(0.1)
 
     try:
@@ -376,7 +384,12 @@
     """
     counter = 1
     start = False
+    sleep_time = 1
 
+    #dg.heaters.cmd_heaters_broadcast_interval_override(50)
+    #sleep(1)
+    #dg.voltages.cmd_monitored_voltages_broadcast_interval_override(50)
+
     try:
         while True:
             hd_run = get_hd_run_info()
@@ -387,6 +400,7 @@
             load_cell = get_load_cells_info()
             valves = get_dg_valves_states()
             ro = get_ro_info()
+            new_ro = get_new_ro_info()
             temp = get_temperature_sensors_info()
             heaters = get_heaters_info()
             dg_fans = get_dg_fans_info()
@@ -397,7 +411,7 @@
             idle_bad_fill = get_dg_idle_bad_fill_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 + idle_bad_fill + '\r'
+                  new_ro + temp + heaters + conc_pumps + dg_fans + valves + blood_leak + hd_pumps + fill_info + '\r'
 
             if hd.alarms.get_alarm_state(97) and start is False:
                 dg.conductivity_sensors.cmd_conductivity_sensor_override(ConductivitySensorsEnum.CD2.value, 13700.00)
@@ -422,7 +436,7 @@
             """
             print(var)
             f.write(var)
-            sleep(1)
+            sleep(sleep_time)
     except KeyboardInterrupt:
         dg.hd_proxy.cmd_start_stop_dg(start=False)
         f.close()
@@ -623,7 +637,7 @@
 
     # run_chemical_disinfect()
 
-    # run_dg()
+    #run_dg()
 
     # cmd_set_disinfect_ui_screen()
 
@@ -635,6 +649,10 @@
     #    print(get_temperature_sensors_info(), get_dg_fans_info())
     #    sleep(1)
 
+    #while True:
+    #    print(get_new_ro_info(), get_ro_info())
+    #    sleep(1)
+
     # test_dg_fans_alarms()
 
     #test_dvt_drain_pump()