Index: tests/hd_valves_test.py
===================================================================
diff -u -r6b5600f056eff25cbb365fa6a5eefc4f5fad9360 -r3a70bfb451b74106348c064c34f19934aadd9119
--- tests/hd_valves_test.py	(.../hd_valves_test.py)	(revision 6b5600f056eff25cbb365fa6a5eefc4f5fad9360)
+++ tests/hd_valves_test.py	(.../hd_valves_test.py)	(revision 3a70bfb451b74106348c064c34f19934aadd9119)
@@ -1,16 +1,16 @@
 ###########################################################################
 #
-# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+# Copyright (c) 2020-2022 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 hd_valves_test.py
+# @file    hd_valves_test.py
 #
-# @author (last) Dara Navaei
-# @date (last) 02-Oct-2020
-# @author (original) Dara Navaei
-# @date (original) 19-Aug-2020
+# @author  (last)      Dara Navaei
+# @date    (last)      12-Oct-2021
+# @author  (original)  Dara Navaei
+# @date    (original)  19-Aug-2020
 #
 ############################################################################
 import sys
@@ -86,20 +86,30 @@
 
 def change_valves_position():
 
-    valve = ValvesEnum.VDI.value
-    valves.cmd_home_hd_valve(valve)
-    sleep(0.25)
+    valve = ValvesEnum.VDI
+    valves.cmd_home_hd_valve(valve.value)
+    sleep(0.5)
 
-    valves.cmd_set_hd_valve_position(valve, ValvesPositions.VALVE_POSITION_B_OPEN.value)
+    valves.cmd_set_hd_valve_position(valve.value, ValvesPositions.VALVE_POSITION_B_OPEN.value)
     sleep(0.05)
-    valves.cmd_set_hd_valve_position(valve, ValvesPositions.VALVE_POSITION_A_INSERT_EJECT.value)
+    valves.cmd_set_hd_valve_position(valve.value, ValvesPositions.VALVE_POSITION_A_INSERT_EJECT.value)
 
     while True:
 
-        print("Pos, {}, Cmd, {}, Curr, {}, PosA, {}, PosB, {}, PosC, {}, State, {}, PWM, {}"
-              .format(valves.hd_valve_fast_pos, valves.hd_valves_fast_cmd, valves.hd_valve_fast_current,
-                      valves.hd_valves_pos_a, valves.hd_valves_pos_b, valves.hd_valves_pos_c, valves.hd_valve_state,
-                      valves.hd_valves_pwm))
+        try:
+            status = ('ID, {}, Pos, {}, PosCnt, {}, Cmd, {}, State, {}, Current, {}, PosA, {}, PosB, {}, PosC, {} \r'
+                      .format(valves.valves_status[valve.name]['Valve'],
+                              valves.valves_status[valve.name]['PosID'],
+                              valves.valves_status[valve.name]['PosCnt'],
+                              valves.valves_status[valve.name]['Cmd'],
+                              valves.valves_status[valve.name]['State'],
+                              valves.valves_status[valve.name]['Current'],
+                              valves.valves_status[valve.name]['PosA'],
+                              valves.valves_status[valve.name]['PosB'],
+                              valves.valves_status[valve.name]['PosC']))
+            print(status)
+        except:
+            pass
 
         sleep(1)