From 81ecd1b4434ce9a69bcdd603ee3934feb4b1b1dd Mon Sep 17 00:00:00 2001 From: Silvano Cerza Date: Mon, 14 Jun 2021 16:04:06 +0200 Subject: [PATCH] Fix upload waiting for port without 1200bps touch --- commands/upload/upload.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/commands/upload/upload.go b/commands/upload/upload.go index 545651d4f0d..e29fbfa47c0 100644 --- a/commands/upload/upload.go +++ b/commands/upload/upload.go @@ -292,13 +292,15 @@ func runProgramAction(pm *packagemanager.PackageManager, // to set the board in bootloader mode actualPort := port if programmer == nil && !burnBootloader { - // Perform reset via 1200bps touch if requested and wait for upload port if requested. + // Perform reset via 1200bps touch if requested and wait for upload port also if requested. touch := uploadProperties.GetBoolean("upload.use_1200bps_touch") - wait := uploadProperties.GetBoolean("upload.wait_for_upload_port") + wait := false portToTouch := "" if touch { portToTouch = port + // Waits for upload port only if a 1200bps touch is done + wait = uploadProperties.GetBoolean("upload.wait_for_upload_port") } // if touch is requested but port is not specified, print a warning