espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-04 02:50:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'contrib/github_pr_8788' into 'master'

Browse Source 
Add idf.py monitor argument --no-reset (-R) (GitHub PR)

Closes IDFGH-7189, IDFGH-7301, and IDFGH-5963

See merge request espressif/esp-idf!18010
This commit is contained in:
Martin Gano
2022-05-10 23:34:37 +08:00
parent df5872b3a4 c02c0cc9b7
commit 89f754183e
6 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/idf_py_actions/serial_ext.py
View File

@@ -81,7 +81,7 @@ def action_extensions(base_actions, project_path):
return result
def monitor(action, ctx, args, print_filter, monitor_baud, encrypted, timestamps, timestamp_format):
def monitor(action, ctx, args, print_filter, monitor_baud, encrypted, no_reset, timestamps, timestamp_format):
"""
Run idf_monitor.py to watch build output
"""
@@ -92,6 +92,12 @@ def action_extensions(base_actions, project_path):
monitor_args = [PYTHON, idf_monitor]
if project_desc['target'] != 'linux':
if no_reset and args.port is None:
msg = ('WARNING: --no-reset is ignored. '
'Please specify the port with the --port argument in order to use this option.')
yellow_print(msg)
no_reset = False
esp_port = args.port or _get_default_serial_port(args)
monitor_args += ['-p', esp_port]
@@ -132,6 +138,9 @@ def action_extensions(base_actions, project_path):
if encrypted:
monitor_args += ['--encrypted']
if no_reset:
monitor_args += ['--no-reset']
if timestamps:
monitor_args += ['--timestamps']
@@ -259,6 +268,12 @@ def action_extensions(base_actions, project_path):
'IDF Monitor will invoke encrypted-flash and encrypted-app-flash targets '
'if this option is set. This option is set by default if IDF Monitor was invoked '
'together with encrypted-flash or encrypted-app-flash target.'),
}, {
'names': ['--no-reset'],
'is_flag': True,
'help': ('Disable reset on monitor startup. '
'IDF Monitor will not reset the MCU target by toggling DTR/RTS lines on startup '
'if this option is set.'),
}, {
'names': ['--timestamps'],
'is_flag': True,