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

Block discovery threads until packages is not null, otherwise boards discovered during startup will miss model name

Browse Source
This commit is contained in:
Federico Fissore
2015-04-13 15:35:45 +02:00
parent 350adb99cb
commit eacddd6120
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,8 @@ import java.util.*;
public class NetworkDiscovery implements Discovery, ServiceListener, cc.arduino.packages.discoverers.network.NetworkTopologyListener { public class NetworkDiscovery implements Discovery, ServiceListener, cc.arduino.packages.discoverers.network.NetworkTopologyListener {
private static final int MAX_TIME_AWAITING_FOR_PACKAGES = 5000;
private final List<BoardPort> boardPortsDiscoveredWithJmDNS; private final List<BoardPort> boardPortsDiscoveredWithJmDNS;
private final Map<InetAddress, JmDNS> mappedJmDNSs; private final Map<InetAddress, JmDNS> mappedJmDNSs;
private Timer networkCheckerTimer; private Timer networkCheckerTimer;
@ -121,6 +123,16 @@ public class NetworkDiscovery implements Discovery, ServiceListener, cc.arduino.
@Override @Override
public void serviceResolved(ServiceEvent serviceEvent) { public void serviceResolved(ServiceEvent serviceEvent) {
int sleptFor = 0;
while (BaseNoGui.packages == null && sleptFor <= MAX_TIME_AWAITING_FOR_PACKAGES) {
try {
Thread.sleep(1000);
sleptFor += 1000;
} catch (InterruptedException e) {
e.printStackTrace();
}
}
ServiceInfo info = serviceEvent.getInfo(); ServiceInfo info = serviceEvent.getInfo();
for (InetAddress inetAddress : info.getInet4Addresses()) { for (InetAddress inetAddress : info.getInet4Addresses()) {
String address = inetAddress.getHostAddress(); String address = inetAddress.getHostAddress();

12
arduino-core/src/cc/arduino/packages/discoverers/serial/SerialBoardsLister.java
View File

@ -43,6 +43,8 @@ import static processing.app.I18n._;
public class SerialBoardsLister extends TimerTask { public class SerialBoardsLister extends TimerTask {
private static final int MAX_TIME_AWAITING_FOR_PACKAGES = 5000;
private final SerialDiscovery serialDiscovery; private final SerialDiscovery serialDiscovery;
public SerialBoardsLister(SerialDiscovery serialDiscovery) { public SerialBoardsLister(SerialDiscovery serialDiscovery) {
@ -55,8 +57,14 @@ public class SerialBoardsLister extends TimerTask {
@Override @Override
public void run() { public void run() {
if (BaseNoGui.packages == null) { int sleptFor = 0;
return; while (BaseNoGui.packages == null && sleptFor <= MAX_TIME_AWAITING_FOR_PACKAGES) {
try {
Thread.sleep(1000);
sleptFor += 1000;
} catch (InterruptedException e) {
e.printStackTrace();
}
} }
Platform platform = BaseNoGui.getPlatform(); Platform platform = BaseNoGui.getPlatform();