alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'monitor_no_reset' into 'master'

Browse Source 
fix(tools/idf_monitor): exit with error if monitor is run with --no-reset and without --port

Closes IDFGH-13094

See merge request espressif/esp-idf!31705
This commit is contained in:
Roland Dobai 2024-06-25 04:20:13 +08:00
commit 4f3522d343
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/idf_py_actions/serial_ext.py
View File

@ -12,6 +12,7 @@ from typing import Optional
from typing import Tuple from typing import Tuple
import click import click
from idf_py_actions.errors import FatalError
from idf_py_actions.global_options import global_options from idf_py_actions.global_options import global_options
from idf_py_actions.tools import ensure_build_directory from idf_py_actions.tools import ensure_build_directory
from idf_py_actions.tools import get_default_serial_port from idf_py_actions.tools import get_default_serial_port
@ -117,12 +118,10 @@ def action_extensions(base_actions: Dict, project_path: str) -> Dict:
if project_desc['target'] != 'linux': if project_desc['target'] != 'linux':
if no_reset and args.port is None: if no_reset and args.port is None:
msg = ( raise FatalError(
'WARNING: --no-reset is ignored. ' 'Error: --no-reset is only supported when used with a port.'
'Please specify the port with the --port argument in order to use this option.' 'Please specify the port with the --port argument in order to use this option.'
) )
yellow_print(msg)
no_reset = False
args.port = args.port or get_default_serial_port() args.port = args.port or get_default_serial_port()
monitor_args += ['-p', args.port] monitor_args += ['-p', args.port]
@ -927,7 +926,8 @@ def action_extensions(base_actions: Dict, project_path: str) -> Dict:
'help': ( 'help': (
'Disable reset on monitor startup. ' 'Disable reset on monitor startup. '
'IDF Monitor will not reset the MCU target by toggling DTR/RTS lines on startup ' 'IDF Monitor will not reset the MCU target by toggling DTR/RTS lines on startup '
'if this option is set.' 'if this option is set. '
'This option only works if --port argument is specified.'
), ),
}, },
{ {