Merge branch 'bugfix/idf_py_fixes' into 'master'
idf.py fixes from GitHub Closes IDFGH-1005 and IDFGH-1006 See merge request idf/esp-idf!5012
This commit is contained in:
commit
113e02aa3a
1 changed files with 2 additions and 2 deletions
|
@ -66,7 +66,7 @@ GENERATORS = \
|
|||
[
|
||||
# ('generator name', 'build command line', 'version command line', 'verbose flag')
|
||||
("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_VERBOSE = dict((a[0], a[3]) for a in GENERATORS)
|
||||
|
@ -507,7 +507,7 @@ def get_default_serial_port():
|
|||
ports = list(reversed(sorted(
|
||||
p.device for p in serial.tools.list_ports.comports())))
|
||||
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]
|
||||
except IndexError:
|
||||
raise RuntimeError("No serial ports found. Connect a device, or use '-p PORT' option to set a specific port.")
|
||||
|
|
Loading…
Reference in a new issue