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

Network discovery: not showing board name is not resolvable (was printing "null")

Browse Source
This commit is contained in:
Federico Fissore 2014-11-25 13:51:47 +01:00
parent 5bbdc6dd26
commit ca1a355628
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arduino-core/src/cc/arduino/packages/discoverers/NetworkDiscovery.java
View File

@ -31,7 +31,7 @@ package cc.arduino.packages.discoverers;
import cc.arduino.packages.BoardPort; import cc.arduino.packages.BoardPort;
import cc.arduino.packages.Discovery; import cc.arduino.packages.Discovery;
import cc.arduino.packages.discoverers.network.*; import cc.arduino.packages.discoverers.network.NetworkChecker;
import processing.app.BaseNoGui; import processing.app.BaseNoGui;
import processing.app.helpers.NetUtils; import processing.app.helpers.NetUtils;
import processing.app.helpers.PreferencesMap; import processing.app.helpers.PreferencesMap;
@ -141,8 +141,10 @@ public class NetworkDiscovery implements Discovery, ServiceListener, cc.arduino.
String label = name + " at " + address; String label = name + " at " + address;
if (board != null) { if (board != null) {
String boardName = BaseNoGui.getPlatform().resolveDeviceByBoardID(BaseNoGui.packages, board); String boardName = BaseNoGui.getPlatform().resolveDeviceByBoardID(BaseNoGui.packages, board);
if (boardName != null) {
label += " (" + boardName + ")"; label += " (" + boardName + ")";
} }
}
BoardPort port = new BoardPort(); BoardPort port = new BoardPort();
port.setAddress(address); port.setAddress(address);