reliable method to get iSerial field

Author: facchinm

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

@@ -166,7 +166,7 @@ protected Map<String, Object> resolveDeviceByVendorIdProductId(Map<String, Targe
                 boardData.put("board", board);
                 boardData.put("vid", vids.get(i));
                 boardData.put("pid", pids.get(i));
-                boardData.put("iserial", readVIDPID.substring(vidPid.length()));
+                boardData.put("iserial", readVIDPID.substring(vidPid.length()+1));
                 return boardData;
               }
             }