espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/idf_py_fixes_v3.3' into 'release/v3.3'

Browse Source 
idf.py fixes from GitHub (v3.3)

See merge request espressif/esp-idf!6001
This commit is contained in:
Angus Gratton
2019-09-13 14:52:50 +08:00
parent cc68a512d2 2192de7111
commit e8e5410cef
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/idf.py
View File

@ -66,7 +66,7 @@ GENERATORS = \
[ [
# ('generator name', 'build command line', 'version command line', 'verbose flag') # ('generator name', 'build command line', 'version command line', 'verbose flag')
("Ninja", ["ninja"], ["ninja", "--version"], "-v"), ("Ninja", ["ninja"], ["ninja", "--version"], "-v"),
(MAKE_GENERATOR, [MAKE_CMD, "-j", str(multiprocessing.cpu_count() + 2)], ["make", "--version"], "VERBOSE=1"), (MAKE_GENERATOR, [MAKE_CMD, "-j", str(multiprocessing.cpu_count() + 2)], [MAKE_CMD, "--version"], "VERBOSE=1"),
] ]
GENERATOR_CMDS = dict((a[0], a[1]) for a in GENERATORS) GENERATOR_CMDS = dict((a[0], a[1]) for a in GENERATORS)
GENERATOR_VERBOSE = dict((a[0], a[3]) for a in GENERATORS) GENERATOR_VERBOSE = dict((a[0], a[3]) for a in GENERATORS)
@ -497,7 +497,7 @@ def get_default_serial_port():
ports = list(reversed(sorted( ports = list(reversed(sorted(
p.device for p in serial.tools.list_ports.comports()))) p.device for p in serial.tools.list_ports.comports())))
try: try:
print("Choosing default port %s (use '-p PORT' option to set a specific serial port)" % ports[0]) print("Choosing default port %s (use '-p PORT' option to set a specific serial port)" % ports[0].encode('ascii', 'ignore'))
return ports[0] return ports[0]
except IndexError: except IndexError:
raise RuntimeError("No serial ports found. Connect a device, or use '-p PORT' option to set a specific port.") raise RuntimeError("No serial ports found. Connect a device, or use '-p PORT' option to set a specific port.")