Commit 2222e0f

committed

Merge pull request #2709 from projectgus/master

Fix auto-reset on Leonardo-derived boards from Linux hosts

2 parents 72bf977 + a6909bd commit 2222e0fCopy full SHA for 2222e0f

File tree

-3

lines changed

arduino-core/src
- cc/arduino/packages/uploaders
  - SerialUploader.java
- processing/app
  - Serial.java

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String`
`116`	`116`	`if (verbose)`
`117`	`117`	`System.out.println(`
`118`	`118`	`I18n.format(_("Forcing reset using 1200bps open/close on port {0}"), uploadPort));`
`119`		`- Serial.touchPort(uploadPort, 1200);`
	`119`	`+ Serial.touchForCDCReset(uploadPort);`
`120`	`120`	`}`
`121`	`121`	`Thread.sleep(400);`
`122`	`122`	`if (waitForUploadPort) {`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -80,11 +80,12 @@ public Serial(String iname) throws SerialException {`
`80`	`80`	`new Float(PreferencesData.get("serial.stopbits")).floatValue());`
`81`	`81`	`}`
`82`	`82`
`83`		`- public static boolean touchPort(String iname, intirate) throws SerialException {`
	`83`	`+ public static boolean touchForCDCReset(String iname) throws SerialException {`
`84`	`84`	`SerialPort serialPort = new SerialPort(iname);`
`85`	`85`	`try {`
`86`	`86`	`serialPort.openPort();`
`87`		`- serialPort.setParams(irate, 8, SerialPort.STOPBITS_1, SerialPort.PARITY_NONE);`
	`87`	`+ serialPort.setParams(1200, 8, SerialPort.STOPBITS_1, SerialPort.PARITY_NONE);`
	`88`	`+ serialPort.setDTR(false);`
`88`	`89`	`serialPort.closePort();`
`89`	`90`	`return true;`
`90`	`91`	`} catch (SerialPortException e) {`

Comments

(0)