Add iSerial to reported VID_PID string

serial.port.iserial holds the iSerial value

Author: facchinm

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

@@ -86,6 +86,7 @@ public void run() {
       if (boardData != null) {
         boardPort.getPrefs().put("vid", boardData.get("vid").toString());
         boardPort.getPrefs().put("pid", boardData.get("pid").toString());
+        boardPort.getPrefs().put("iserial", boardData.get("iserial").toString());
 
         TargetBoard board = (TargetBoard) boardData.get("board");
         if (board != null) {

arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java

@@ -37,6 +37,7 @@
 import cc.arduino.LoadVIDPIDSpecificPreferences;
 import cc.arduino.packages.Uploader;
 import processing.app.*;
+import cc.arduino.packages.BoardPort;
 import processing.app.debug.RunnerException;
 import processing.app.debug.TargetPlatform;
 import processing.app.helpers.OSUtils;
@@ -152,6 +153,11 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
       }
     }
 
+    BoardPort boardPort = BaseNoGui.getDiscoveryManager().find(PreferencesData.get("serial.port"));
+    if (boardPort.getPrefs().get("iserial") != null) {
+      prefs.put("serial.port.iserial", boardPort.getPrefs().get("iserial"));
+    }
+
     prefs.put("build.path", buildPath);
     prefs.put("build.project_name", className);
     if (verbose) {

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

@@ -161,11 +161,12 @@ 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()+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.lastIndexOf("\\")+1);
         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;
         }
       }
     }