alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-09-01 06:27:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'monitor_win_color-v5.1' into 'release/v5.1'

Browse Source 
bug(idf_monitor): fix color on windows with hints (v5.1)

See merge request espressif/esp-idf!23346
This commit is contained in:
Roland Dobai
2023-04-24 14:00:05 +08:00
parent 4e73cb77e5 49718b20a5
commit 83a682ca1a
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/idf_py_actions/serial_ext.py
View File

@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
# SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Apache-2.0
import json
@@ -156,14 +156,14 @@ def action_extensions(base_actions: Dict, project_path: str) -> Dict:
idf_py = [PYTHON] + _get_commandline_options(ctx) # commands to re-run idf.py
monitor_args += ['-m', ' '.join("'%s'" % a for a in idf_py)]
hints = False # Temporarily disabled because of https://github.com/espressif/esp-idf/issues/9610
hints = not args.no_hints
# Temporally ignore SIGINT, which is used in idf_monitor to spawn gdb.
old_handler = signal.getsignal(signal.SIGINT)
signal.signal(signal.SIGINT, signal.SIG_IGN)
try:
RunTool('idf_monitor', monitor_args, args.project_dir, build_dir=args.build_dir, hints=hints, interactive=True)()
RunTool('idf_monitor', monitor_args, args.project_dir, build_dir=args.build_dir, hints=hints, interactive=True, convert_output=True)()
finally:
signal.signal(signal.SIGINT, old_handler)