X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMicroUSB.java;h=6ffdb6281ea82e0e9a14a68a588675c9101e7667;hp=437fa0bcde45c54374d2591814d0fca144b47460;hb=5b7ec0c69343db3793c0317939b5eff1f2d04752;hpb=f0216d721ed13f4d3dc608bb6ad8f83732b27c0a diff --git a/micropeak/MicroUSB.java b/micropeak/MicroUSB.java index 437fa0bc..6ffdb628 100644 --- a/micropeak/MicroUSB.java +++ b/micropeak/MicroUSB.java @@ -19,7 +19,8 @@ package org.altusmetrum.micropeak; import java.util.*; import libaltosJNI.*; -import org.altusmetrum.altosuilib_2.*; +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 +}