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

PluggableDiscovery: added a 'port' field in json messages

Browse Source 
The new format of 'add' and 'remove' actions is changed from:

{
  "eventType": "add",
  "address": "/dev/ttyACM0",
  "label": "/dev/ttyACM0",
  "prefs": {
    "vendorId": "0x2341"
    "productId": "0x0043",
    "serialNumber": "85235353137351018160",
  },
  "identificationPrefs": {
    "vid": "0x2341"
    "pid": "0x0043",
  },
  "protocol": "serial",
  "protocolLabel": "Serial Port"
}

to:

{
  "eventType": "add",
  "port": {
    "address": "/dev/ttyACM0",
    "label": "/dev/ttyACM0",
    "prefs": {
      "vendorId": "0x2341"
      "productId": "0x0043",
      "serialNumber": "85235353137351018160",
    },
    "identificationPrefs": {
      "vid": "0x2341"
      "pid": "0x0043",
    },
    "protocol": "serial",
    "protocolLabel": "Serial Port"
  }
}
This commit is contained in:
Cristian Maglie 2018-11-30 11:19:07 +01:00
parent 7186213034
commit 8e9f0cfd76
1 changed files with 2 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/PluggableDiscovery.java
View File

@ -156,7 +156,7 @@ public class PluggableDiscovery implements Discovery {
case "add": case "add":
try { try {
BoardPort port = mapper.treeToValue(node, BoardPort.class); BoardPort port = mapper.treeToValue(node.get("port"), BoardPort.class);
port.searchMatchingBoard(); port.searchMatchingBoard();
addOrUpdate(port); addOrUpdate(port);
} catch (JsonProcessingException e) { } catch (JsonProcessingException e) {
@ -167,7 +167,7 @@ public class PluggableDiscovery implements Discovery {
case "remove": case "remove":
try { try {
BoardPort port = mapper.treeToValue(node, BoardPort.class); BoardPort port = mapper.treeToValue(node.get("port"), BoardPort.class);
remove(port); remove(port);
} catch (JsonProcessingException e) { } catch (JsonProcessingException e) {
System.err.println(format("{0}: Invalid BoardPort message", discoveryName)); System.err.println(format("{0}: Invalid BoardPort message", discoveryName));