Commit 2b18d1f

committed

Merge remote-tracking branch 'arduino/master'

2 parents 63fc618 + 643f847 commit 2b18d1fCopy full SHA for 2b18d1f

File tree

-0

lines changed

-0

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -177,6 +177,13 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String`
`177`	`177`	`Thread.sleep(100);`
`178`	`178`	`}`
`179`	`179`
	`180`	`+ BoardPort boardPort = BaseNoGui.getDiscoveryManager().find(PreferencesData.get("serial.port"));`
	`181`	`+ try {`
	`182`	`+ prefs.put("serial.port.iserial", boardPort.getPrefs().getOrExcept("iserial"));`
	`183`	`+ } catch (Exception e) {`
	`184`	`+ // if serial port does not contain an iserial field`
	`185`	`+ }`
	`186`	`+`
`180`	`187`	`prefs.put("build.path", buildPath);`
`181`	`188`	`prefs.put("build.project_name", className);`
`182`	`189`	`if (verbose) {`

Comments

(0)