Add iSerial to reported VID_PID string

serial.port.iserial holds the iSerial value

Author: facchinm

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

@@ -161,11 +161,13 @@ protected Map<String, Object> resolveDeviceByVendorIdProductId(Map<String, Targe
             List<String> pids = new LinkedList<String>(board.getPreferences().subTree("pid", 1).values());
             for (int i = 0; i < vids.size(); i++) {
               String vidPid = vids.get(i) + "_" + pids.get(i);
-              if (vidPid.toUpperCase().equals(readVIDPID)) {
+              if (readVIDPID.contains(vidPid.toUpperCase())) {
                 Map<String, Object> boardData = new HashMap<String, Object>();
                 boardData.put("board", board);
                 boardData.put("vid", vids.get(i));
                 boardData.put("pid", pids.get(i));
+                boardData.put("iserial", readVIDPID.substring(vidPid.length()));
+                PreferencesData.set("serial.port.iserial", readVIDPID.substring(vidPid.length()+1));
                 return boardData;
               }
             }

arduino-core/src/processing/app/linux/UDevAdmParser.java

@@ -12,9 +12,13 @@ public String extractVIDAndPID(String output) throws IOException {
 
     Object vid = properties.get("ID_VENDOR_ID");
     Object pid = properties.get("ID_MODEL_ID");
+    Object serial = properties.get("ID_SERIAL_SHORT");
     if (vid == null || pid == null)
       return null;
-    return ("0x" + vid + "_0x" + pid).toUpperCase();
+    if (serial == null) {
+        serial = "";
+    }
+    return ("0x" + vid + "_0x" + pid).toUpperCase() + "_" + serial;
   }
 
 }

arduino-core/src/processing/app/macosx/SystemProfilerParser.java

@@ -81,7 +81,7 @@ public String extractVIDAndPID(String output, String serial) throws IOException
           String computedDevicePathMinusChar = computedDevicePath.substring(0, computedDevicePath.length() - 1);
           String serialMinusChar = serial.substring(0, serial.length() - 1);
           if (computedDevicePath.equalsIgnoreCase(serial) || computedDevicePathMinusChar.equalsIgnoreCase(serialMinusChar)) {
-            return (device.get(VID) + "_" + device.get(PID)).toUpperCase();
+            return (device.get(VID) + "_" + device.get(PID)).toUpperCase() + "_" + device.get(SERIAL_NUMBER);
           }
         }
         device = new HashMap<>();

arduino-core/src/processing/app/windows/ListComPortsParser.java

@@ -59,8 +59,9 @@ public String extractVIDAndPID(String output, String serial) throws IOException
         String vidPidPart = lineParts[lineParts.length - 1];
         Matcher vidMatcher = vidRegExp.matcher(vidPidPart);
         Matcher pidMatcher = pidRegExp.matcher(vidPidPart);
+        String iSerial = vidPidPart.substring(vidPidPart.indexOf("PID_")+8);
         if (vidMatcher.find() && pidMatcher.find()) {
-          return ("0x" + vidMatcher.group(1) + "_0x" + pidMatcher.group(1)).toUpperCase();
+          return ("0x" + vidMatcher.group(1) + "_0x" + pidMatcher.group(1)).toUpperCase() + "_" + iSerial;
         }
       }
     }