arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-22 08:22:04 +03:00
Code Activity

Leonardo auto-reset-and-upload changes for Windows (explanation below)

Browse Source 
On Windows COM port changes when board switched between bootloader and sketch.  No way to prevent this so now Windows users have to select the upload port separate from the comm port.  Also, handling of reset into bootloader was broken on Windows.  Would occasionally leave the original COM port completely unusable.  Changed the way this reset is initiated.
Finally, had to add upload.disable.flushing=true flag to boards.txt so IDE wouldn't try to flush the original COM port after it disappeared.
This commit is contained in:
Zach Eveland
2012-02-13 00:56:06 -05:00
parent 5c53796cec
commit bab3c5eade
3 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/src/processing/app/debug/AvrdudeUploader.java
View File

@ -30,6 +30,7 @@ import processing.app.Base;
import processing.app.Preferences;
import processing.app.Serial;
import processing.app.SerialException;
import static processing.app.I18n._;
import java.io.*;
import java.util.*;
@ -63,36 +64,53 @@ public class AvrdudeUploader extends Uploader {
return avrdude(params);
}
return uploadViaBootloader(buildPath, className);
return uploadViaBootloader(buildPath, className);
}
private static String selectLeonardoUploadPort() {
String names[] = Serial.list();
String result = (String)JOptionPane.showInputDialog(null, processing.app.I18n.format(_("Please select the Leonardo upload port:")), "Select upload port", JOptionPane.PLAIN_MESSAGE, null, names, 0);
return result;
}
private boolean uploadViaBootloader(String buildPath, String className)
throws RunnerException, SerialException {
throws RunnerException, SerialException {
Map<String, String> boardPreferences = Base.getBoardPreferences();
List commandDownloader = new ArrayList();
String protocol = boardPreferences.get("upload.protocol");
// avrdude wants "stk500v1" to distinguish it from stk500v2
if (protocol.equals("stk500"))
protocol = "stk500v1";
protocol = "stk500v1";
// need to do a little dance for Leonardo and derivatives:
// open then close the port at the magic baudrate (usually 1200 bps) first to signal to the
// sketch that it should reset into bootloader. after doing this wait a moment for the
// bootloader to enumerate
// bootloader to enumerate. On Windows, also must deal with the fact that the COM port number
// changes from bootloader to sketch.
String leonardoUploadPort = null;
if (boardPreferences.get("bootloader.path").equals("caterina_LUFA")) {
try {
Serial serial = new Serial(Integer.parseInt(boardPreferences.get("upload.speed")));
serial.dispose();
serial = null;
Thread.sleep(8000);
Serial.touchPort(Preferences.get("serial.port"), 1200);
Thread.sleep(8000);
} catch (SerialException ex) {
} catch (InterruptedException ex) { }
} catch (InterruptedException ex) { }
if (Base.isWindows()) {
leonardoUploadPort = selectLeonardoUploadPort();
if (null == leonardoUploadPort)
return false;
}
}
commandDownloader.add("-c" + protocol);
commandDownloader.add(
"-P" + (Base.isWindows() ? "\\\\.\\" : "") + Preferences.get("serial.port"));
if (null == leonardoUploadPort) {
commandDownloader.add(
"-P" + (Base.isWindows() ? "\\\\.\\" : "") + Preferences.get("serial.port"));
} else {
commandDownloader.add(
"-P" + (Base.isWindows() ? "\\\\.\\" : "") + leonardoUploadPort);
}
commandDownloader.add(
"-b" + Integer.parseInt(boardPreferences.get("upload.speed")));
commandDownloader.add("-D"); // don't erase