From 284c5bd17363cfb72aff49ec2311b4dfcd8a9c07 Mon Sep 17 00:00:00 2001 From: Federico Fissore Date: Wed, 30 Jan 2013 13:05:10 +0100 Subject: [PATCH] adapted Platform.resolveDeviceByVendorIdProductId to new boards.txt format for vid and pid --- app/src/processing/app/Platform.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/processing/app/Platform.java b/app/src/processing/app/Platform.java index 250efa8e9..83283ca05 100644 --- a/app/src/processing/app/Platform.java +++ b/app/src/processing/app/Platform.java @@ -24,6 +24,8 @@ package processing.app; import static processing.app.I18n._; import java.io.File; +import java.util.LinkedList; +import java.util.List; import java.util.Map; import javax.swing.UIManager; @@ -142,9 +144,11 @@ public class Platform { for (TargetPackage targetPackage : packages.values()) { for (TargetPlatform targetPlatform : targetPackage.getPlatforms().values()) { for (PreferencesMap board : targetPlatform.getBoards().values()) { - if (board.containsKey("vid_pid")) { - String[] vidPids = board.get("vid_pid").split(","); - for (String vidPid : vidPids) { + List vids = new LinkedList(board.createSubTree("vid").values()); + if (!vids.isEmpty()) { + List pids = new LinkedList(board.createSubTree("pid").values()); + for (int i = 0; i< vids.size(); i++) { + String vidPid = vids.get(i) + "_" + pids.get(i); if (vidPid.toUpperCase().equals(readVIDPID)) { return board.get("name"); }