kopia lustrzana https://github.com/espressif/esp-idf
Merge branch 'bugfix/flash_from_monitor_on_windows_v4.4' into 'release/v4.4'
Tools: IDF Monitor should flash with the unmodified port (v4.4) See merge request espressif/esp-idf!17257pull/8934/head
commit
c00c343161
|
@ -276,16 +276,20 @@ def main() -> None:
|
|||
parser = get_parser()
|
||||
args = parser.parse_args()
|
||||
|
||||
# The port name is changed in cases described in the following lines. Use a local argument and
|
||||
# avoid the modification of args.port.
|
||||
port = args.port
|
||||
|
||||
# GDB uses CreateFile to open COM port, which requires the COM name to be r'\\.\COMx' if the COM
|
||||
# number is larger than 10
|
||||
if os.name == 'nt' and args.port.startswith('COM'):
|
||||
args.port = args.port.replace('COM', r'\\.\COM')
|
||||
if os.name == 'nt' and port.startswith('COM'):
|
||||
port = port.replace('COM', r'\\.\COM')
|
||||
yellow_print('--- WARNING: GDB cannot open serial ports accessed as COMx')
|
||||
yellow_print('--- Using %s instead...' % args.port)
|
||||
elif args.port.startswith('/dev/tty.') and sys.platform == 'darwin':
|
||||
args.port = args.port.replace('/dev/tty.', '/dev/cu.')
|
||||
yellow_print('--- Using %s instead...' % port)
|
||||
elif port.startswith('/dev/tty.') and sys.platform == 'darwin':
|
||||
port = port.replace('/dev/tty.', '/dev/cu.')
|
||||
yellow_print('--- WARNING: Serial ports accessed as /dev/tty.* will hang gdb if launched.')
|
||||
yellow_print('--- Using %s instead...' % args.port)
|
||||
yellow_print('--- Using %s instead...' % port)
|
||||
|
||||
args.elf_file.close() # don't need this as a file
|
||||
|
||||
|
@ -308,12 +312,14 @@ def main() -> None:
|
|||
cls = LinuxMonitor
|
||||
yellow_print('--- idf_monitor on linux ---')
|
||||
else:
|
||||
serial_instance = serial.serial_for_url(args.port, args.baud, do_not_open=True)
|
||||
serial_instance = serial.serial_for_url(port, args.baud, do_not_open=True)
|
||||
serial_instance.dtr = False
|
||||
serial_instance.rts = False
|
||||
|
||||
# Pass the actual used port to callee of idf_monitor (e.g. make) through `ESPPORT` environment
|
||||
# variable
|
||||
# Pass the actual used port to callee of idf_monitor (e.g. idf.py/cmake) through `ESPPORT` environment
|
||||
# variable.
|
||||
# Note that the port must be original port argument without any replacement done in IDF Monitor (idf.py
|
||||
# has a check for this).
|
||||
# To make sure the key as well as the value are str type, by the requirements of subprocess
|
||||
espport_val = str(args.port)
|
||||
os.environ.update({ESPPORT_ENVIRON: espport_val})
|
||||
|
|
Ładowanie…
Reference in New Issue