Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

idf.py: Choose a default serial port for all targets if '-p' is not given

Browse source
This commit is contained in:
Angus Gratton 2018-09-06 20:32:49 +08:00 committed by Angus Gratton
parent deb46b415f
commit 36bc73e5a6
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tools/idf.py
View file

@ -35,6 +35,7 @@ import multiprocessing
import re import re
import shutil import shutil
import json import json
import serial.tools.list_ports
class FatalError(RuntimeError): class FatalError(RuntimeError):
""" """
@ -236,8 +237,9 @@ def build_target(target_name, args):
def _get_esptool_args(args): def _get_esptool_args(args):
esptool_path = os.path.join(os.environ["IDF_PATH"], "components/esptool_py/esptool/esptool.py") esptool_path = os.path.join(os.environ["IDF_PATH"], "components/esptool_py/esptool/esptool.py")
if args.port is None:
args.port = get_default_serial_port()
result = [ PYTHON, esptool_path ] result = [ PYTHON, esptool_path ]
if args.port is not None:
result += [ "-p", args.port ] result += [ "-p", args.port ]
result += [ "-b", str(args.baud) ] result += [ "-b", str(args.baud) ]
return result return result
@ -267,6 +269,8 @@ def monitor(action, args):
""" """
Run idf_monitor.py to watch build output Run idf_monitor.py to watch build output
""" """
if args.port is None:
args.port = get_default_serial_port()
desc_path = os.path.join(args.build_dir, "project_description.json") desc_path = os.path.join(args.build_dir, "project_description.json")
if not os.path.exists(desc_path): if not os.path.exists(desc_path):
_ensure_build_directory(args) _ensure_build_directory(args)
@ -409,6 +413,21 @@ def get_commandline_options():
result.append(a) result.append(a)
return result return result
def get_default_serial_port():
""" Return a default serial port. esptool can do this (smarter), but it can create
inconsistencies where esptool.py uses one port and idf_monitor uses another.
Same logic as esptool.py search order, reverse sort by name and choose the first 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])
return ports[0]
except IndexError:
raise RuntimeError("No serial ports found. Connect a device, or use '-p PORT' option to set a specific port.")
def main(): def main():
if sys.version_info[0] != 2 or sys.version_info[1] != 7: if sys.version_info[0] != 2 or sys.version_info[1] != 7:
raise FatalError("ESP-IDF currently only supports Python 2.7, and this is Python %d.%d.%d. Search for 'Setting the Python Interpreter' in the ESP-IDF docs for some tips to handle this." % sys.version_info[:3]) raise FatalError("ESP-IDF currently only supports Python 2.7, and this is Python %d.%d.%d. Search for 'Setting the Python Interpreter' in the ESP-IDF docs for some tips to handle this." % sys.version_info[:3])