*/
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 {
+public class MicroUSB extends altos_device implements AltosDevice {
static boolean initialized = false;
static boolean loaded_library = false;
String name = getName();
if (name == null)
name = "Altus Metrum";
- return String.format("%-20.20s %4d %s",
- name, getSerial(), getPath());
+ return String.format("%-24.24s %s",
+ name, getPath());
}
public String toShortString() {
String name = getName();
if (name == null)
name = "Altus Metrum";
- return String.format("%s %d %s",
- name, getSerial(), getPath());
+ return String.format("%s %s",
+ name, getPath());
}
}
private boolean isMicro() {
- if (getVendor() != 0x0403)
- return false;
- if (getProduct() != 0x6001)
- 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) {
+ return isMicro();
}
static java.util.List<MicroUSB> list() {
if (!load_library())
return null;
- SWIGTYPE_p_altos_list list = libaltos.altos_list_start();
+ SWIGTYPE_p_altos_list list = libaltos.altos_ftdi_list_start();
ArrayList<MicroUSB> device_list = new ArrayList<MicroUSB>();
if (list != null) {
return device_list;
}
-}
\ No newline at end of file
+}