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 'feature/idfpy_serial_ext_formatting' into 'master'

Browse Source 
Tools: Update formatting at serial_ext.py

See merge request espressif/esp-idf!8954
This commit is contained in:
Ivan Grokhotkov 2020-06-25 17:40:06 +08:00
commit 0f3aa8f520
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/idf_py_actions/serial_ext.py
View File

@ -85,12 +85,7 @@ def action_extensions(base_actions, project_path):
monitor_args += ["-p", args.port] monitor_args += ["-p", args.port]
if not monitor_baud: if not monitor_baud:
if os.getenv("IDF_MONITOR_BAUD"): monitor_baud = os.getenv("IDF_MONITOR_BAUD") or os.getenv("MONITORBAUD") or project_desc["monitor_baud"]
monitor_baud = os.getenv("IDF_MONITOR_BAUD", None)
elif os.getenv("MONITORBAUD"):
monitor_baud = os.getenv("MONITORBAUD", None)
else:
monitor_baud = project_desc["monitor_baud"]
monitor_args += ["-b", monitor_baud] monitor_args += ["-b", monitor_baud]
monitor_args += ["--toolchain-prefix", project_desc["monitor_toolprefix"]] monitor_args += ["--toolchain-prefix", project_desc["monitor_toolprefix"]]