update host/device_info to build with freertos for espressif board. Add hil test for host/device_info

2 files changed, 15 insertions, 13 deletions

diff --git a/test/hil/hil_test.py b/test/hil/hil_test.py
index 4a0510223..91fe6b67c 100755
--- a/test/hil/hil_test.py
+++ b/test/hil/hil_test.py
@@ -50,6 +50,7 @@ verbose = False
 # Path
 # -------------------------------------------------------------
 OPENCOD_ADI_PATH = f'{os.getenv("HOME")}/app/openocd_adi'
+TINYUSB_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 # get usb serial by id
 def get_serial_dev(id, vendor_str, product_str, ifnum):
@@ -83,7 +84,7 @@ def open_serial_dev(port):
                 # slight delay since kernel may occupy the port briefly
                 time.sleep(0.5)
                 timeout = timeout - 0.5
-                ser = serial.Serial(port, timeout=5)
+                ser = serial.Serial(port, baudrate=115200, timeout=5)
                 break
             except serial.SerialException:
                 pass
@@ -212,6 +213,7 @@ def flash_esptool(board, firmware):
         flash_args = f.read().strip().replace('\n', ' ')
     command = (f'esptool.py --chip {idf_target} -p {port} {board["flasher_args"]} '
                f'--before=default_reset --after=hard_reset write_flash {flash_args}')
+    # command = f'echo abc'
     ret = run_cmd(command, cwd=fw_dir)
     return ret
 
@@ -228,7 +230,7 @@ def test_dual_host_info_to_device_cdc(board):
     uid = board['uid']
     declared_devs = [f'{d["vid_pid"]}_{d["serial"]}' for d in board['tests']['dev_attached']]
 
-    port = get_serial_dev(board["flasher_sn"], None, None, 0)
+    port = get_serial_dev(uid, 'TinyUSB', "TinyUSB_Device", 0)
     ser = open_serial_dev(port)
     # read from serial, first line should contain vid/pid and serial
     data = ser.read(1000)
@@ -253,14 +255,16 @@ def test_dual_host_info_to_device_cdc(board):
 # -------------------------------------------------------------
 # Tests: host
 # -------------------------------------------------------------
-def test_host_cdc_msc_hid(board):
+def test_host_device_info(board):
     uid = board['uid']
     declared_devs = [f'{d["vid_pid"]}_{d["serial"]}' for d in board['tests']['dev_attached']]
 
-    port = get_serial_dev(uid, 'TinyUSB', "TinyUSB_Device", 0)
+    port = get_serial_dev(board["flasher_sn"], None, None, 0)
     ser = open_serial_dev(port)
-    # read from serial, first line should contain vid/pid and serial
     data = ser.read(1000)
+    if len(data) == 0:
+        assert False, 'No data from device'
+
     lines = data.decode('utf-8').splitlines()
     enum_dev_sn = []
     for l in lines:
@@ -276,11 +280,8 @@ def test_host_cdc_msc_hid(board):
             print(f'\r\n  {failed_msg} {STATUS_FAILED} ', end='')
         else:
             assert False, failed_msg
-    return 0
 
-
-def test_host_cdc_msc_hid_freertos(board):
-    test_host_cdc_msc_hid(board)
+    return 0
 
 
 # -------------------------------------------------------------
@@ -454,7 +455,7 @@ def test_board(board):
                     print(f'{name:25} {skip:30} ... Skip')
 
     # board_test is added last to disable board's usb
-    test_list.append('device/board_test')
+    #test_list.append('device/board_test')
 
     err_count = 0
     flags_on_list = [""]
@@ -466,9 +467,9 @@ def test_board(board):
         if f1 != "":
             f1_str = '-' + f1.replace(' ', '-')
         for test in test_list:
-            fw_dir = f'cmake-build/cmake-build-{name}{f1_str}/{test}'
+            fw_dir = f'{TINYUSB_ROOT}/cmake-build/cmake-build-{name}{f1_str}/{test}'
             if not os.path.exists(fw_dir):
-                fw_dir = f'examples/cmake-build-{name}{f1_str}/{test}'
+                fw_dir = f'{TINYUSB_ROOT}/examples/cmake-build-{name}{f1_str}/{test}'
             fw_name = f'{fw_dir}/{os.path.basename(test)}'
             print(f'{name+f1_str:40} {test:30} ... ', end='')
 
diff --git a/test/hil/tinyusb.json b/test/hil/tinyusb.json
index 1b0b7c99a..2d61981f2 100644
--- a/test/hil/tinyusb.json
+++ b/test/hil/tinyusb.json
@@ -4,7 +4,8 @@
             "name": "espressif_p4_function_ev",
             "uid": "6055F9F98715",
             "tests": {
-                "only": ["device/cdc_msc_freertos", "device/hid_composite_freertos", "host/cdc_msc_hid_freertos"]
+                "only": ["device/cdc_msc_freertos", "device/hid_composite_freertos", "host/device_info"],
+                "dev_attached": [{"vid_pid": "1a86_55d4", "serial": "52D2002427"}]
             },
             "flasher": "esptool",
             "flasher_sn": "4ea4f48f6bc3ee11bbb9d00f9e1b1c54",