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

Merge remote-tracking branch 'arduino/master'

Browse Source
This commit is contained in:
Cristian Maglie 2016-04-08 20:17:26 +02:00
commit 2b18d1fba0
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,6 +177,13 @@ public class SerialUploader extends Uploader {
Thread.sleep(100);
}
BoardPort boardPort = BaseNoGui.getDiscoveryManager().find(PreferencesData.get("serial.port"));
try {
prefs.put("serial.port.iserial", boardPort.getPrefs().getOrExcept("iserial"));
} catch (Exception e) {
// if serial port does not contain an iserial field
}
prefs.put("build.path", buildPath);
prefs.put("build.project_name", className);
if (verbose) {