Index: tests/test_flush.py
===================================================================
diff -u -r1261e3824e07dc805e6bf3d73c5ee340bb88fc15 -r21a53e63bedeb01f5eb2a85130e6b6fc454f2f88
--- tests/test_flush.py	(.../test_flush.py)	(revision 1261e3824e07dc805e6bf3d73c5ee340bb88fc15)
+++ tests/test_flush.py	(.../test_flush.py)	(revision 21a53e63bedeb01f5eb2a85130e6b6fc454f2f88)
@@ -13,7 +13,16 @@
                     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, {}, '
@@ -36,9 +45,9 @@
 
 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
@@ -64,27 +73,25 @@
 def run_flush_mode():
 
     complete_counter = 1
-    f = open("/home/fw/projects/dialin/tests/Flush_mode.log", "w")
+    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.hd_proxy.cmd_start_stop_dg_flush(start=False)
 
                 # Write a few more complete states to make sure the complete state items are recorded
                 if complete_counter == 3: