Commit 53dfc0d

committed

Disable serial monitor for non-SSH network ports

1 parent 40e7b1d commit 53dfc0dCopy full SHA for 53dfc0d

File tree

+15

-1

lines changed

app/src
- cc/arduino/packages
  - MonitorFactory.java
- processing/app
  - Editor.java

+15

-1

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,13 @@ public class MonitorFactory {`
`37`	`37`
`38`	`38`	`public AbstractMonitor newMonitor(BoardPort port) {`
`39`	`39`	`if ("network".equals(port.getProtocol())) {`
`40`		`- return new NetworkMonitor(port);`
	`40`	`+ if ("yes".equals(port.getPrefs().get("ssh_upload"))) {`
	`41`	`+ // the board is SSH capable`
	`42`	`+ return new NetworkMonitor(port);`
	`43`	`+ } else {`
	`44`	`+ // SSH not supported, no monitor support`
	`45`	`+ return null;`
	`46`	`+ }`
`41`	`47`	`}`
`42`	`48`
`43`	`49`	`return new SerialMonitor(port);`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2318,6 +2318,14 @@ public void handleSerial() {`
`2318`	`2318`	`}`
`2319`	`2319`
`2320`	`2320`	`serialMonitor = new MonitorFactory().newMonitor(port);`
	`2321`	`+`
	`2322`	`+ if (serialMonitor == null) {`
	`2323`	`+ String board = port.getPrefs().get("board");`
	`2324`	`+ String boardName = BaseNoGui.getPlatform().resolveDeviceByBoardID(BaseNoGui.packages, board);`
	`2325`	`+ statusError(I18n.format(tr("Serial monitor is not supported on network ports such as {0} for the {1} in this release"), PreferencesData.get("serial.port"), boardName));`
	`2326`	`+ return;`
	`2327`	`+ }`
	`2328`	`+`
`2321`	`2329`	`Base.setIcon(serialMonitor);`
`2322`	`2330`
`2323`	`2331`	`// If currently uploading, disable the monitor (it will be later`

Comments

(0)