rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-20 14:54:31 +01:00
Code Issues Releases Activity

Remove 1200 automagic baud rate every time the IDE use the serial port touch

Browse Source
This commit is contained in:
Cristian Maglie 2012-10-20 17:21:46 +02:00
parent c97e3623a4
commit ed15dc3b5a
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/processing/app/debug/BasicUploader.java
View File

@ -126,24 +126,28 @@ public class BasicUploader extends Uploader {
throw new RunnerException(e);
}
// For Leonardo wait until the bootloader serial port disconnects and the
// sketch serial port reconnects (or timeout after a few seconds if the
// sketch port never comes back). Doing this saves users from accidentally
// opening Serial Monitor on the soon-to-be-orphaned bootloader port.
// Remove the magic baud rate (1200bps) to avoid
// future unwanted board resets
try {
if (uploadResult && waitForUploadPort) {
Thread.sleep(500);
long timeout = System.currentTimeMillis() + 2000;
while (timeout > System.currentTimeMillis()) {
List<String> portList = Serial.list();
String uploadPort = Preferences.get("serial.port");
if (portList.contains(Preferences.get("serial.port"))) {
// Remove the magic baud rate (1200bps) to avoid
// future unwanted board resets
Serial.touchPort(uploadPort, 9600);
break;
if (uploadResult && doTouch) {
String uploadPort = Preferences.get("serial.port");
if (waitForUploadPort) {
// For Due/Leonardo wait until the bootloader serial port disconnects and the
// sketch serial port reconnects (or timeout after a few seconds if the
// sketch port never comes back). Doing this saves users from accidentally
// opening Serial Monitor on the soon-to-be-orphaned bootloader port.
Thread.sleep(500);
long timeout = System.currentTimeMillis() + 2000;
while (timeout > System.currentTimeMillis()) {
List<String> portList = Serial.list();
if (portList.contains(uploadPort)) {
Serial.touchPort(uploadPort, 9600);
break;
}
Thread.sleep(100);
}
Thread.sleep(100);
} else {
Serial.touchPort(uploadPort, 9600);
}
}
} catch (InterruptedException ex) {