Skip to content

Increase wait for upload port timeout to 5s on all platforms #4515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 1, 2016
Merged

Increase wait for upload port timeout to 5s on all platforms #4515

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de41265
Increase wait for upload port timeout to 5s on all platforms
sandeepmistry Feb 1, 2016
7a535d9
Add OS X specific delay after waiting for upload port, to prevent "Re…
sandeepmistry Feb 29, 2016
7cb1399
Apply extra 250ms after waitForUploadPort to all platforms
sandeepmistry Mar 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,11 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
// it happened within 250 ms. So we wait until the reset should
// have already occured before we start scanning.
actualUploadPort = waitForUploadPort(userSelectedUploadPort, before);

// on OS X, if the port is opened too quickly after it is detected,
// a "Resource busy" error occurs, add a delay to workaround this,
// apply to other platforms as well.
Thread.sleep(250);
}
} catch (SerialException e) {
throw new RunnerException(e);
Expand Down Expand Up @@ -247,11 +252,10 @@ private String waitForUploadPort(String uploadPort, List<String> before) throws
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;
Expand Down