From c7f4fb56d8b704f8a9c51b05fd31097e5b9ddcca Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Thu, 16 May 2019 21:20:10 +0800 Subject: [PATCH 1/2] idf.py: Use mingw32-make for version check Closes https://github.com/espressif/esp-idf/issues/3333 --- tools/idf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/idf.py b/tools/idf.py index 5ea0f1452d..57dfc63e23 100755 --- a/tools/idf.py +++ b/tools/idf.py @@ -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) From 2192de7111d601c63c240b6ff68037799292f8e0 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Fri, 17 May 2019 14:25:53 +0800 Subject: [PATCH 2/2] idf.py: Fix encoding issue with serial port names on Windows Closes https://github.com/espressif/esp-idf/issues/3334 --- tools/idf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/idf.py b/tools/idf.py index 57dfc63e23..0e170333ec 100755 --- a/tools/idf.py +++ b/tools/idf.py @@ -497,7 +497,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.")