X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosUSBDevice.java;h=b11a3934b1376906974eab03cdf02b8c698f3817;hb=89aa06cfdcb02de1894ccb01aed97782f9eec9b2;hp=deed00568b1d023fe3ad50e332c6a83d45598e1b;hpb=84163eee7847a09fe78f8762b28f857d76bf5755;p=fw%2Faltos

diff --git a/altosui/AltosUSBDevice.java b/altosui/AltosUSBDevice.java
index deed0056..b11a3934 100644
--- a/altosui/AltosUSBDevice.java
+++ b/altosui/AltosUSBDevice.java
@@ -39,6 +39,13 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
 
 	}
 
+	public String getErrorString() {
+		altos_error	error = new altos_error();
+
+		libaltos.altos_get_last_error(error);
+		return String.format("%s (%d)", error.getString(), error.getCode());
+	}
+
 	public SWIGTYPE_p_altos_file open() {
 		return libaltos.altos_open(this);
 	}
@@ -77,13 +84,13 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
 		return false;
 	}
 
-	static AltosUSBDevice[] list(int product) {
+	static java.util.List<AltosDevice> list(int product) {
 		if (!Altos.load_library())
 			return null;
 
 		SWIGTYPE_p_altos_list list = libaltos.altos_list_start();
 
-		ArrayList<AltosUSBDevice> device_list = new ArrayList<AltosUSBDevice>();
+		ArrayList<AltosDevice> device_list = new ArrayList<AltosDevice>();
 		if (list != null) {
 			for (;;) {
 				AltosUSBDevice device = new AltosUSBDevice();
@@ -95,9 +102,6 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
 			libaltos.altos_list_finish(list);
 		}
 
-		AltosUSBDevice[] devices = new AltosUSBDevice[device_list.size()];
-		for (int i = 0; i < device_list.size(); i++)
-			devices[i] = device_list.get(i);
-		return devices;
+		return device_list;
 	}
 }
\ No newline at end of file