arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Code Activity

NetworkDiscovery was silently failing because packages werenìt ready yet. Fixes #2837

Browse Source
This commit is contained in:
Federico Fissore
2015-04-13 13:29:05 +02:00
parent b42c6667e1
commit 40535dfc55
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,7 +137,7 @@ public class NetworkDiscovery implements Discovery, ServiceListener, cc.arduino.
} }
String label = name + " at " + address; String label = name + " at " + address;
if (board != null) { if (board != null && BaseNoGui.packages != null) {
String boardName = BaseNoGui.getPlatform().resolveDeviceByBoardID(BaseNoGui.packages, board); String boardName = BaseNoGui.getPlatform().resolveDeviceByBoardID(BaseNoGui.packages, board);
if (boardName != null) { if (boardName != null) {
label += " (" + boardName + ")"; label += " (" + boardName + ")";

2
arduino-core/src/processing/app/Platform.java
View File

@ -164,6 +164,8 @@ public class Platform {
} }
public String resolveDeviceByBoardID(Map<String, TargetPackage> packages, String boardId) { public String resolveDeviceByBoardID(Map<String, TargetPackage> packages, String boardId) {
assert packages != null;
assert boardId != null;
for (TargetPackage targetPackage : packages.values()) { for (TargetPackage targetPackage : packages.values()) {
for (TargetPlatform targetPlatform : targetPackage.getPlatforms().values()) { for (TargetPlatform targetPlatform : targetPackage.getPlatforms().values()) {
for (TargetBoard board : targetPlatform.getBoards().values()) { for (TargetBoard board : targetPlatform.getBoards().values()) {