Index: tests/test_flush.py
===================================================================
diff -u -re979b3b8161d4232a93fd7c995e1aaeb690c1c6c -racd09d02879e8add4cf7f694f5db8e423a76c341
--- tests/test_flush.py	(.../test_flush.py)	(revision e979b3b8161d4232a93fd7c995e1aaeb690c1c6c)
+++ tests/test_flush.py	(.../test_flush.py)	(revision acd09d02879e8add4cf7f694f5db8e423a76c341)
@@ -1,14 +1,14 @@
 ###########################################################################
 #
-# Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+# Copyright (c) 2021-2023 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
+# @date    (last)      19-Sep-2022
 # @author  (original)  Dara Navaei
 # @date    (original)  16-Apr-2021
 #
@@ -24,12 +24,18 @@
 
 def get_flush_mode_info():
 
+    """
     info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Drain_vol, {:5.3f}, Top_alarm, {}, Op, {}, '
             'Sub, {}, History, {}, '
             .format(dg.flush.flush_state, dg.flush.overall_elapsed_time, dg.flush.state_elapsed_time,
-                    dg.flush.flush_drain_line_volume_l, hd.alarms.alarm_top, dg.events.get_dg_nth_event(1),
-                    dg.events.get_dg_nth_event(2), dg.events.get_dg_events(2, 25)))
+                    dg.flush.flush_drain_line_volume_l, hd.alarms.alarm_top, dg.events.get_dg_events(1, 0),
+                    dg.events.get_dg_nth_event(2), dg.events.get_dg_events(2, 70)))
+    """
 
+    info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Drain_vol, {:5.3f}, Top_alarm, {}, '
+            .format(dg.flush.flush_state, dg.flush.overall_elapsed_time, dg.flush.state_elapsed_time,
+                    dg.flush.flush_drain_line_volume_l, hd.alarms.alarm_top))
+
     return info
 
 
@@ -86,10 +92,10 @@
 
 def get_ro_info():
 
-    info = ('RO, {}, PPi, {:5.3f}, PPo, {:5.3f}, PWM, {:5.3f}, Flow, {:5.3f}, '
+    info = ('RO, {}, PPi, {:5.3f}, PPo, {:5.3f}, PWM, {:5.3f}, Flow, {:5.3f}, Feedback_PWM, {: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.measured_flow_rate_lpm, dg.ro_pump.feedback_duty_cycle_pct))
     return info
 
 
@@ -104,8 +110,8 @@
 
     complete_counter = 1
     f = open("/home/fw/projects/dialin/tests/flush_mode.log", "w")
-    #dg.hd_proxy.cmd_start_stop_dg_flush()
-    dg.cmd_dg_software_reset_request()
+    dg.hd_proxy.cmd_start_stop_dg_flush()
+    #dg.cmd_dg_software_reset_request()
 
     try:
         while True:
@@ -131,19 +137,19 @@
                 # Write a few more complete states to make sure the complete state items are recorded
                 if complete_counter == 3:
                     f.close()
-                    events = dg.events.get_dg_events(2, 60)
-                    for event in events:
-                        print(event)
+                    #events = dg.events.get_dg_events(2, 60)
+                    #for event in events:
+                    #    print(event)
                     break
 
                 complete_counter += 1
 
     except KeyboardInterrupt:
         dg.hd_proxy.cmd_start_stop_dg_flush(start=False)
         f.close()
-        events = dg.events.get_dg_events(2, 50)
-        for event in events:
-            print(event)
+        #events = dg.events.get_dg_events(2, 50)
+        #for event in events:
+        #    print(event)
 
 
 if __name__ == "__main__":