X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMicroUSB.java;h=3bd61470cc847c4eb0d763562014f10c73f23ab7;hp=244f7bc0d3af7ad7c3155951cc9c287600f7dbda;hb=324ceea43c115f4bed3a5276e57559c6c76b07c1;hpb=d83587c3c66b730cc54ca153714eee520ee40b2c diff --git a/micropeak/MicroUSB.java b/micropeak/MicroUSB.java index 244f7bc0..3bd61470 100644 --- a/micropeak/MicroUSB.java +++ b/micropeak/MicroUSB.java @@ -19,7 +19,7 @@ package org.altusmetrum.micropeak; import java.util.*; import libaltosJNI.*; -import org.altusmetrum.altosuilib.*; +import org.altusmetrum.altosuilib_1.*; public class MicroUSB extends altos_device implements AltosDevice { @@ -50,7 +50,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()); } @@ -90,7 +90,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 device_list = new ArrayList(); if (list != null) { @@ -98,7 +98,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); }