update hil test to include dual and host for pico/pico2

This commit is contained in:
hathach
2025-03-24 23:20:54 +07:00
parent db537861b2
commit 875e645b32
3 changed files with 100 additions and 89 deletions

View File

@@ -81,7 +81,7 @@ def get_serial_dev(id, vendor_str, product_str, ifnum):
return f'/dev/serial/by-id/usb-{vendor_str}_{product_str}_{id}-if{ifnum:02d}'
else:
# just use id: mostly for cp210x/ftdi flasher
pattern = f'/dev/serial/by-id/usb-*_{id}-if{ifnum:02d}*'
pattern = f'/dev/serial/by-id/usb-*_{id}-if*'
port_list = glob.glob(pattern)
return port_list[0]
@@ -98,18 +98,19 @@ def get_hid_dev(id, vendor_str, product_str, event):
def open_serial_dev(port):
timeout = ENUM_TIMEOUT
ser = None
t_step = 0.1
while timeout:
if os.path.exists(port):
try:
# slight delay since kernel may occupy the port briefly
time.sleep(0.5)
timeout = timeout - 0.5
time.sleep(t_step)
timeout = timeout - t_step
ser = serial.Serial(port, baudrate=115200, timeout=5)
break
except serial.SerialException:
pass
time.sleep(0.5)
timeout = timeout - 0.5
time.sleep(t_step)
timeout = timeout - t_step
assert timeout, f'Cannot open port f{port}' if os.path.exists(port) else f'Port {port} not existed'
return ser
@@ -202,14 +203,14 @@ def reset_stflash(board):
def flash_openocd(board, firmware):
flasher = board['flasher']
ret = run_cmd(f'openocd -c "tcl_port disabled" -c "gdb_port disabled" -c "adapter serial {flasher["uid"]}" '
f'{flasher["args"]} -c init -c halt -c "program {firmware}.elf verify" -c reset -c exit')
f'{flasher["args"]} -c "init; halt; program {firmware}.elf verify; reset; exit"')
return ret
def reset_openocd(board):
flasher = board['flasher']
ret = run_cmd(f'openocd -c "tcl_port disabled" -c "gdb_port disabled" -c "adapter serial {flasher["uid"]}" '
f'{flasher["args"]} -c "reset exit"')
f'{flasher["args"]} -c "init; reset run; exit"')
return ret
@@ -310,6 +311,9 @@ def test_dual_host_info_to_device_cdc(board):
assert False, 'No data from device'
lines = data.decode('utf-8').splitlines()
if verbose:
print('\n'.join(lines))
enum_dev_sn = []
for l in lines:
vid_pid_sn = re.search(r'ID ([0-9a-fA-F]+):([0-9a-fA-F]+) SN (\w+)', l)
@@ -577,10 +581,10 @@ def test_board(board):
print(f' {e}')
else:
print()
print(f' Test failed: {e}, retry {i+1}')
print(f' Test failed: {e}, retry {i+2}/{max_rety}')
time.sleep(1)
else:
print(f'Flashing failed, retry {i+1}')
print(f'Flashing failed, retry {i+2}/{max_rety}')
time.sleep(1)
if ret.returncode != 0:

View File

@@ -99,7 +99,7 @@
"name": "raspberry_pi_pico",
"uid": "E6614C311B764A37",
"tests": {
"device": true, "host": false, "dual": false,
"device": true, "host": true, "dual": true,
"dev_attached": [{"vid_pid": "1a86_55d4", "serial": "52D2002470"}]
},
"flasher": {
@@ -112,7 +112,7 @@
"name": "raspberry_pi_pico2",
"uid": "560AE75E1C7152C9",
"tests": {
"device": true, "host": false, "dual": false,
"device": true, "host": true, "dual": true,
"dev_attached": [{"vid_pid": "1a86_55d4", "serial": "533D004242"}]
},
"flasher": {