From 5b7ec0c69343db3793c0317939b5eff1f2d04752 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 6 Dec 2014 15:08:53 -0800 Subject: [PATCH] =?utf8?q?micropeak:=20Support=20=C2=B5PUSB=20with=20our?= =?utf8?q?=20own=20USB=20ids?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This matches the new µPUSB id as well as the FTDI USB id. Signed-off-by: Keith Packard --- micropeak/MicroUSB.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/micropeak/MicroUSB.java b/micropeak/MicroUSB.java index 24f6722b..6ffdb628 100644 --- a/micropeak/MicroUSB.java +++ b/micropeak/MicroUSB.java @@ -19,6 +19,7 @@ package org.altusmetrum.micropeak; import java.util.*; import libaltosJNI.*; +import org.altusmetrum.altoslib_5.*; import org.altusmetrum.altosuilib_3.*; public class MicroUSB extends altos_device implements AltosDevice { @@ -75,11 +76,14 @@ public class MicroUSB extends altos_device implements AltosDevice { } private boolean isMicro() { - if (getVendor() != 0x0403) - return false; - if (getProduct() != 0x6015) - return false; - return true; + int vid = getVendor(); + int pid = getProduct(); + if (vid == 0x0403 && pid == 0x6015) + return true; + if (vid == AltosLib.vendor_altusmetrum && + pid == AltosLib.product_mpusb) + return true; + return false; } public boolean matchProduct(int product) { @@ -106,4 +110,4 @@ public class MicroUSB extends altos_device implements AltosDevice { return device_list; } -} \ No newline at end of file +} -- 2.30.2