Index: tests/test_flush.py
===================================================================
diff -u -r01db18a18769df2048346f868412fc8a12631fc0 -r8474f8e345f165187d4dde17840575ee4e98a9b4
--- tests/test_flush.py	(.../test_flush.py)	(revision 01db18a18769df2048346f868412fc8a12631fc0)
+++ tests/test_flush.py	(.../test_flush.py)	(revision 8474f8e345f165187d4dde17840575ee4e98a9b4)
@@ -1,3 +1,18 @@
+###########################################################################
+#
+# Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+#
+# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+#
+# @file    test_flush.py
+#
+# @author  (last)      Dara Navaei
+# @date    (last)      28-Jun-2021
+# @author  (original)  Dara Navaei
+# @date    (original)  16-Apr-2021
+#
+############################################################################
 
 import sys
 sys.path.append("..")
@@ -8,14 +23,25 @@
 
 def get_flush_mode_info():
 
-    info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, '
-            .format(dg.flush.flush_state, dg.flush.overall_elapsed_time, dg.flush.state_elapsed_time))
+    info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Drain_vol, {:5.3f}, '
+            .format(dg.flush.flush_state, dg.flush.overall_elapsed_time, dg.flush.state_elapsed_time,
+                    dg.flush.flush_drain_line_volume_l))
     return info
 
+def get_concentrate_pumps_info():
 
+    info = ('Bicarb_tgt_speed, {:5.3f}, Bicarb_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.conductivity_sensors.conductivity_sensor_cpo, dg.conductivity_sensors.conductivity_sensor_cd1,
+                    dg.conductivity_sensors.conductivity_sensor_cd2))
+    return info
+
+
 def get_dg_valves_states():
 
     info = ('VPi, {}, VSP, {}, VPd, {}, VBf, {}, VPo, {}, VDr, {}, VRc, {}, VRo, {}, VRd, {}, VRi, {}, VRf, {}, '
+            '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],
@@ -26,15 +52,17 @@
                     dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_OUTLET],
                     dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_DRAIN],
                     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_FILL],
+                    dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_DRAIN_1],
+                    dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_DRAIN_2]))
     return info
 
 
 def get_drain_states_info():
 
-    info = ('Drain, {}, DAC, {}, RPM, {}, PRd, {:5.3f}, PDr, {:5.3f}, '.
-            format(DrainPumpStates(dg.drain_pump.drain_pump_state).name,
-                   dg.drain_pump.dac_value, dg.drain_pump.current_drain_pump_rpm,
+    info = ('Drain, {}, DAC, {}, Tgt_RPM, {}, Curr_RPM, {}, PRd, {:5.3f}, PDr, {:5.3f}, '.
+            format(DrainPumpStates(dg.drain_pump.drain_pump_state).name, dg.drain_pump.dac_value,
+                   dg.drain_pump.target_drain_pump_rpm, dg.drain_pump.current_drain_pump_rpm,
                    dg.pressures.drain_pump_inlet_pressure,
                    dg.pressures.drain_pump_outlet_pressure))
     return info
@@ -60,35 +88,35 @@
 def run_flush_mode():
 
     complete_counter = 1
-    f = open("/home/fw/projects/dialin/tests/Flush_mode.log", "w")
-    #dg.flush.cmd_start_stop_flush()
+    f = open("/home/fw/projects/dialin/tests/flush_mode.log", "w")
+    dg.hd_proxy.cmd_start_stop_dg_flush()
     try:
         while True:
             flush = get_flush_mode_info()
             load_cell = get_load_cells_info()
             drain = get_drain_states_info()
             ro = get_ro_info()
+            conc = get_concentrate_pumps_info()
             valves = get_dg_valves_states()
 
-            var = flush + load_cell + drain + ro + valves + '\r'
+            var = flush + load_cell + drain + ro + conc + valves + '\r'
 
             print(var)
             f.write(var)
             sleep(1)
 
             # If the mode came back to standby or standby solo
             if dg.dg_operation_mode == 3 or dg.dg_operation_mode == 4:
-                # If it is the first call, stop heat disinfect
-                if complete_counter == 1:
-                    dg.flush.cmd_start_stop_flush(start=False)
-                    pass
+
                 # Write a few more complete states to make sure the complete state items are recorded
-                elif complete_counter == 3:
+                if complete_counter == 3:
                     f.close()
                     break
 
+                complete_counter += 1
+
     except KeyboardInterrupt:
-        dg.flush.cmd_start_stop_flush(start=False)
+        dg.hd_proxy.cmd_start_stop_dg_flush(start=False)
         f.close()