X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMicroUSB.java;h=6ffdb6281ea82e0e9a14a68a588675c9101e7667;hp=244f7bc0d3af7ad7c3155951cc9c287600f7dbda;hb=5b7ec0c69343db3793c0317939b5eff1f2d04752;hpb=d83587c3c66b730cc54ca153714eee520ee40b2c

diff --git a/micropeak/MicroUSB.java b/micropeak/MicroUSB.java
index 244f7bc0..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.*;
+import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altosuilib_3.*;
 
 public class MicroUSB extends altos_device implements AltosDevice {
 
@@ -50,7 +51,7 @@ public class MicroUSB extends altos_device implements AltosDevice {
 		String	name = getName();
 		if (name == null)
 			name = "Altus Metrum";
-		return String.format("%-20.20s %s",
+		return String.format("%-24.24s %s",
 				     name, getPath());
 	}
 
@@ -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) {
@@ -90,7 +94,7 @@ public class MicroUSB extends altos_device implements AltosDevice {
 		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) {
@@ -98,7 +102,6 @@ public class MicroUSB extends altos_device implements AltosDevice {
 				MicroUSB device = new MicroUSB();
 				if (libaltos.altos_list_next(list, device) == 0)
 					break;
-				System.out.printf("Device %s\n", device.toString());
 				if (device.isMicro())
 					device_list.add(device);
 			}
@@ -107,4 +110,4 @@ public class MicroUSB extends altos_device implements AltosDevice {
 
 		return device_list;
 	}
-}
\ No newline at end of file
+}