From de412656ec8116af3c9b252c3bb12325a6a177ef Mon Sep 17 00:00:00 2001 From: Sandeep Mistry Date: Mon, 1 Feb 2016 15:53:09 -0500 Subject: [PATCH] Increase wait for upload port timeout to 5s on all platforms OS X 10.11 seems to be slower, increasing timeout to 5s on all platforms to keep things simple. --- .../cc/arduino/packages/uploaders/SerialUploader.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java b/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java index 971bfb8c6..4ad990fa9 100644 --- a/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java +++ b/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java @@ -247,11 +247,10 @@ public class SerialUploader extends Uploader { Thread.sleep(250); elapsed += 250; - // On Windows, it can take a long time for the port to disappear and - // come back, so use a longer time out before assuming that the - // selected - // port is the bootloader (not the sketch). - if (((!OSUtils.isWindows() && elapsed >= 500) || elapsed >= 5000) && now.contains(uploadPort)) { + // On Windows and OS X, it can take a few seconds for the port to disappear and + // come back, so use a time out before assuming that the selected port is the + // bootloader (not the sketch). + if (elapsed >= 5000 && now.contains(uploadPort)) { if (verbose) System.out.println("Uploading using selected port: " + uploadPort); return uploadPort;