rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-21 10:52:14 +01:00
Code Issues Releases Activity

SerialDiscovery: reorder a bit the discovery phases to make it clearer

Browse Source
This commit is contained in:
Cristian Maglie 2020-03-23 17:36:30 +01:00 committed by Cristian Maglie
parent 8208376507
commit bc54dd8ef5
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
arduino-core/src/cc/arduino/packages/discoverers/serial/SerialDiscovery.java
View File

@ -128,13 +128,23 @@ public class SerialDiscovery implements Discovery, Runnable {
// add information for newly added ports
for (String newPort : ports) {
String[] parts = newPort.split("_");
// if port has been already discovered bring it back online
BoardPort oldBoardPort = boardPorts.stream() //
.filter(bp -> bp.toCompleteString().equalsIgnoreCase(newPort)) //
.findAny().orElse(null);
if (oldBoardPort != null) {
oldBoardPort.setOnlineStatus(true);
continue;
}
// Otherwise build a BoardPort object out of it and add it to
// to the known boardPorts
String[] parts = newPort.split("_");
if (parts.length < 3) {
// something went horribly wrong
continue;
}
if (parts.length > 3) {
// port name with _ in it (like CP2102 on OSX)
for (int i = 1; i < (parts.length-2); i++) {
@ -146,17 +156,6 @@ public class SerialDiscovery implements Discovery, Runnable {
String port = parts[0];
Map<String, Object> boardData = platform.resolveDeviceByVendorIdProductId(port, BaseNoGui.packages);
// if port has been already discovered bring it back online
BoardPort oldBoardPort = boardPorts.stream() //
.filter(bp -> bp.toCompleteString().equalsIgnoreCase(newPort)) //
.findAny().orElse(null);
if (oldBoardPort != null) {
oldBoardPort.setOnlineStatus(true);
continue;
}
BoardPort boardPort = new BoardPort();
boardPorts.add(boardPort);
boardPort.setAddress(port);
@ -164,6 +163,7 @@ public class SerialDiscovery implements Discovery, Runnable {
boardPort.setOnlineStatus(true);
boardPort.setLabel(port);
Map<String, Object> boardData = platform.resolveDeviceByVendorIdProductId(port, BaseNoGui.packages);
if (boardData != null) {
boardPort.getPrefs().put("vid", boardData.get("vid").toString());
boardPort.getPrefs().put("pid", boardData.get("pid").toString());
@ -176,17 +176,15 @@ public class SerialDiscovery implements Discovery, Runnable {
String boardName = board.getName();
boardPort.setBoardName(boardName);
}
} else if (!parts[1].equals("0000")) {
boardPort.getPrefs().put("vid", parts[1]);
boardPort.getPrefs().put("pid", parts[2]);
// ask Cloud API to match the board with known VID/PID pair
boardCloudResolver.getBoardBy(parts[1], parts[2]);
} else {
if (!parts[1].equals("0000")) {
boardPort.getPrefs().put("vid", parts[1]);
boardPort.getPrefs().put("pid", parts[2]);
// ask Cloud API to match the board with known VID/PID pair
boardCloudResolver.getBoardBy(parts[1], parts[2]);
} else {
boardPort.getPrefs().put("vid", "0000");
boardPort.getPrefs().put("pid", "0000");
boardPort.getPrefs().put("iserial", "");
}
boardPort.getPrefs().put("vid", "0000");
boardPort.getPrefs().put("pid", "0000");
boardPort.getPrefs().put("iserial", "");
}
}
setSerialBoardPorts(boardPorts);