Add extra field to serial discovery targeting Tian board

Author: facchinm

arduino-core/src/processing/app/Platform.java

@@ -236,14 +236,29 @@ public synchronized Map<String, Object> resolveDeviceByVendorIdProductId(String
           List<String> vids = new LinkedList<>(board.getPreferences().subTree("vid", 1).values());
           if (!vids.isEmpty()) {
             List<String> pids = new LinkedList<>(board.getPreferences().subTree("pid", 1).values());
+            List<String> descriptors = new LinkedList<>(board.getPreferences().subTree("descriptor", 1).values());
             for (int i = 0; i < vids.size(); i++) {
               String vidPid = vids.get(i) + "_" + pids.get(i);
               if (vid_pid_iSerial.toUpperCase().contains(vidPid.toUpperCase())) {
+                if (!descriptors.isEmpty()) {
+                  boolean matched = false;
+                  for (int j = 0; j < descriptors.size(); j++) {
+                    if (vid_pid_iSerial.toUpperCase().contains(descriptors.get(j).toUpperCase())) {
+                      matched = true;
+                      break;
+                    }
+                  }
+                  if (matched == false) {
+                      return null;
+                    }
+                }
                 Map<String, Object> boardData = new HashMap<>();
                 boardData.put("board", board);
                 boardData.put("vid", vids.get(i));
                 boardData.put("pid", pids.get(i));
-                boardData.put("iserial", vid_pid_iSerial.substring(vidPid.length()+1));
+                String extrafields = vid_pid_iSerial.substring(vidPid.length()+1);
+                String[] parts = extrafields.split("_");
+                boardData.put("iserial", parts[0]);
                 return boardData;
               }
             }

build/build.xml

@@ -86,7 +86,7 @@
   <property name="portable" value="false" />
 
   <property name="ARDUINO-BUILDER-VERSION" value="1.3.21_r1" />
-  <property name="LIBLISTSERIAL-VERSION" value="1.2.0" />
+  <property name="LIBLISTSERIAL-VERSION" value="1.3.0" />
   <property name="AVRGCC-VERSION" value="4.9.2-atmel3.5.3-arduino2" />
   <property name="AVRDUDE-VERSION" value="6.3.0-arduino6" />
 

build/liblistSerials-1.2.0.zip.sha

@@ -0,0 +1 @@
+519c768773ce02f75bf2418b49d9adf4609dee16