micropeak is code complete now.

[fw/altos] / micropeak / MicroUSB.java

diff --git a/micropeak/MicroUSB.java b/micropeak/MicroUSB.java
index d48610fe720a07d5e057931eb3e29389254455ad..244f7bc0d3af7ad7c3155951cc9c287600f7dbda 100644 (file)
--- a/micropeak/MicroUSB.java
+++ b/micropeak/MicroUSB.java
@@ -16,10 +16,12 @@
  */
 
 package org.altusmetrum.micropeak;
+
 import java.util.*;
 import libaltosJNI.*;
+import org.altusmetrum.altosuilib.*;
 
-public class MicroUSB extends altos_device {
+public class MicroUSB extends altos_device implements AltosDevice {
 
        static boolean  initialized = false;
        static boolean  loaded_library = false;
@@ -48,16 +50,16 @@ public class MicroUSB extends altos_device {
                String  name = getName();
                if (name == null)
                        name = "Altus Metrum";
-               return String.format("%-20.20s %4d %s",
-                                    name, getSerial(), getPath());
+               return String.format("%-20.20s %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());
 
        }
 
@@ -75,11 +77,15 @@ public class MicroUSB extends altos_device {
        private boolean isMicro() {
                if (getVendor() != 0x0403)
                        return false;
-               if (getProduct() != 0x6001)
+               if (getProduct() != 0x6015)
                        return false;
                return true;
        }
 
+       public boolean matchProduct(int product) {
+               return isMicro();
+       }
+
        static java.util.List<MicroUSB> list() {
                if (!load_library())
                        return null;
@@ -92,6 +98,7 @@ public class MicroUSB extends altos_device {
                                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);
                        }