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

When ports "move", they move in mysterious ways. Watching them closely so we don't miss the catch

Browse Source
This commit is contained in:
Federico Fissore
2015-06-11 17:00:53 +02:00
parent 7900e7fbeb
commit c138628c00
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
View File

@ -106,17 +106,18 @@ public class SerialUploader extends Uploader {
t = prefs.get("upload.wait_for_upload_port"); t = prefs.get("upload.wait_for_upload_port");
boolean waitForUploadPort = (t != null) && t.equals("true"); boolean waitForUploadPort = (t != null) && t.equals("true");
String uploadPort = prefs.getOrExcept("serial.port"); String userSelectedUploadPort = prefs.getOrExcept("serial.port");
String actualUploadPort = null;
if (doTouch) { if (doTouch) {
try { try {
// Toggle 1200 bps on selected serial port to force board reset. // Toggle 1200 bps on selected serial port to force board reset.
List<String> before = Serial.list(); List<String> before = Serial.list();
if (before.contains(uploadPort)) { if (before.contains(userSelectedUploadPort)) {
if (verbose) if (verbose)
System.out.println( System.out.println(
I18n.format(_("Forcing reset using 1200bps open/close on port {0}"), uploadPort)); I18n.format(_("Forcing reset using 1200bps open/close on port {0}"), userSelectedUploadPort));
Serial.touchForCDCReset(uploadPort); Serial.touchForCDCReset(userSelectedUploadPort);
} }
Thread.sleep(400); Thread.sleep(400);
if (waitForUploadPort) { if (waitForUploadPort) {
@ -124,18 +125,21 @@ public class SerialUploader extends Uploader {
// otherwise assert DTR, which would cancel the WDT reset if // otherwise assert DTR, which would cancel the WDT reset if
// it happened within 250 ms. So we wait until the reset should // it happened within 250 ms. So we wait until the reset should
// have already occured before we start scanning. // have already occured before we start scanning.
uploadPort = waitForUploadPort(uploadPort, before); actualUploadPort = waitForUploadPort(userSelectedUploadPort, before);
} }
} catch (SerialException e) { } catch (SerialException e) {
throw new RunnerException(e); throw new RunnerException(e);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RunnerException(e.getMessage()); throw new RunnerException(e.getMessage());
} }
prefs.put("serial.port", uploadPort); if (actualUploadPort == null) {
if (uploadPort.startsWith("/dev/")) { actualUploadPort = userSelectedUploadPort;
prefs.put("serial.port.file", uploadPort.substring(5)); }
prefs.put("serial.port", actualUploadPort);
if (actualUploadPort.startsWith("/dev/")) {
prefs.put("serial.port.file", actualUploadPort.substring(5));
} else { } else {
prefs.put("serial.port.file", uploadPort); prefs.put("serial.port.file", actualUploadPort);
} }
} }
@ -158,9 +162,9 @@ public class SerialUploader extends Uploader {
throw new RunnerException(e); throw new RunnerException(e);
} }
String finalUploadPort = null;
if (uploadResult && doTouch) { if (uploadResult && doTouch) {
try { try {
String previousUploadPort = PreferencesData.get("serial.port");
if (waitForUploadPort) { if (waitForUploadPort) {
// For Due/Leonardo wait until the bootloader serial port disconnects and the // 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 serial port reconnects (or timeout after a few seconds if the
@ -170,7 +174,11 @@ public class SerialUploader extends Uploader {
long started = System.currentTimeMillis(); long started = System.currentTimeMillis();
while (System.currentTimeMillis() - started < 2000) { while (System.currentTimeMillis() - started < 2000) {
List<String> portList = Serial.list(); List<String> portList = Serial.list();
if (portList.contains(previousUploadPort)) { if (portList.contains(actualUploadPort)) {
finalUploadPort = actualUploadPort;
break;
} else if (portList.contains(userSelectedUploadPort)) {
finalUploadPort = userSelectedUploadPort;
break; break;
} }
Thread.sleep(250); Thread.sleep(250);
@ -181,7 +189,10 @@ public class SerialUploader extends Uploader {
} }
} }
BaseNoGui.selectSerialPort(uploadPort); if (finalUploadPort == null) {
finalUploadPort = actualUploadPort;
}
BaseNoGui.selectSerialPort(finalUploadPort);
return uploadResult; return uploadResult;
} }