rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Code Issues Releases Activity

Disable serial monitor for non-SSH network ports

Browse Source
This commit is contained in:
Sandeep Mistry 2017-03-17 12:04:34 -04:00 committed by Cristian Maglie
parent 40e7b1db39
commit 3e9448d34b
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/cc/arduino/packages/MonitorFactory.java
View File

@ -37,7 +37,13 @@ public class MonitorFactory {
public AbstractMonitor newMonitor(BoardPort port) { public AbstractMonitor newMonitor(BoardPort port) {
if ("network".equals(port.getProtocol())) { if ("network".equals(port.getProtocol())) {
if ("yes".equals(port.getPrefs().get("ssh_upload"))) {
// the board is SSH capable
return new NetworkMonitor(port); return new NetworkMonitor(port);
} else {
// SSH not supported, no monitor support
return null;
}
} }
return new SerialMonitor(port); return new SerialMonitor(port);

8
app/src/processing/app/Editor.java
View File

@ -2318,6 +2318,14 @@ public class Editor extends JFrame implements RunnerListener {
} }
serialMonitor = new MonitorFactory().newMonitor(port); serialMonitor = new MonitorFactory().newMonitor(port);
if (serialMonitor == null) {
String board = port.getPrefs().get("board");
String boardName = BaseNoGui.getPlatform().resolveDeviceByBoardID(BaseNoGui.packages, board);
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));
return;
}
Base.setIcon(serialMonitor); Base.setIcon(serialMonitor);
// If currently uploading, disable the monitor (it will be later // If currently uploading, disable the monitor (it will be later