scripts: twister: fix flash to esp32 using esp32 runner
Twister and pytest now flash to the device specified with board_id. Signed-off-by: Armin Kessler <ake@espros.com>
This commit is contained in:
parent
583b92d0da
commit
20b1dddce5
2 changed files with 4 additions and 2 deletions
|
@ -73,6 +73,9 @@ class HardwareAdapter(DeviceAdapter):
|
||||||
if runner == 'pyocd':
|
if runner == 'pyocd':
|
||||||
extra_args.append('--board-id')
|
extra_args.append('--board-id')
|
||||||
extra_args.append(board_id)
|
extra_args.append(board_id)
|
||||||
|
elif runner == "esp32":
|
||||||
|
extra_args.append("--esp-device")
|
||||||
|
extra_args.append(board_id)
|
||||||
elif runner in ('nrfjprog', 'nrfutil'):
|
elif runner in ('nrfjprog', 'nrfutil'):
|
||||||
extra_args.append('--dev-id')
|
extra_args.append('--dev-id')
|
||||||
extra_args.append(board_id)
|
extra_args.append(board_id)
|
||||||
|
|
|
@ -565,14 +565,13 @@ class DeviceHandler(Handler):
|
||||||
|
|
||||||
board_id = hardware.probe_id or hardware.id
|
board_id = hardware.probe_id or hardware.id
|
||||||
product = hardware.product
|
product = hardware.product
|
||||||
serial_port = hardware.serial
|
|
||||||
if board_id is not None:
|
if board_id is not None:
|
||||||
if runner in ("pyocd", "nrfjprog", "nrfutil"):
|
if runner in ("pyocd", "nrfjprog", "nrfutil"):
|
||||||
command_extra_args.append("--dev-id")
|
command_extra_args.append("--dev-id")
|
||||||
command_extra_args.append(board_id)
|
command_extra_args.append(board_id)
|
||||||
elif runner == "esp32":
|
elif runner == "esp32":
|
||||||
command_extra_args.append("--esp-device")
|
command_extra_args.append("--esp-device")
|
||||||
command_extra_args.append(serial_port)
|
command_extra_args.append(board_id)
|
||||||
elif (
|
elif (
|
||||||
runner == "openocd"
|
runner == "openocd"
|
||||||
and product == "STM32 STLink"
|
and product == "STM32 STLink"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue