arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-20 21:01:25 +03:00
Code Activity

Merge pull request #2279 from cmaglie/fix-leo-upload-osx10.9.4

Browse Source 
Fix for upload problems on Arduino Leonardo (and derivatives) on OSX 10.9
This commit is contained in:
Cristian Maglie
2014-09-10 12:58:10 +02:00
parent 82e04ba325 aa776b30ba
commit 6f9674288b
2 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/cc/arduino/packages/uploaders/SerialUploader.java
View File

@ -86,15 +86,13 @@ public class SerialUploader extends Uploader {
System.out.println(_("Forcing reset using 1200bps open/close on port ") + uploadPort);
Serial.touchPort(uploadPort, 1200);
}
Thread.sleep(400);
if (waitForUploadPort) {
// Scanning for available ports seems to open the port or
// otherwise assert DTR, which would cancel the WDT reset if
// it happened within 250 ms. So we wait until the reset should
// have already occured before we start scanning.
Thread.sleep(300);
uploadPort = waitForUploadPort(uploadPort, before);
} else {
Thread.sleep(400);
}
} catch (SerialException e) {
throw new RunnerException(e);