projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add MMA655X driver
[fw/altos]
/
altosui
/
AltosUSBDevice.java
diff --git
a/altosui/AltosUSBDevice.java
b/altosui/AltosUSBDevice.java
index dc746a64fb4aa7de038872bbf18f5fde13d7d523..ed5f8307d178bba720de462c47b358e3f4f4ddf4 100644
(file)
--- 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);
}
public SWIGTYPE_p_altos_file open() {
return libaltos.altos_open(this);
}
@@
-64,7
+71,12
@@
public class AltosUSBDevice extends altos_device implements AltosDevice {
if (want_product == Altos.product_basestation)
return matchProduct(Altos.product_teledongle) ||
matchProduct(Altos.product_teleterra) ||
if (want_product == Altos.product_basestation)
return matchProduct(Altos.product_teledongle) ||
matchProduct(Altos.product_teleterra) ||
- matchProduct(Altos.product_telebt);
+ matchProduct(Altos.product_telebt) ||
+ matchProduct(Altos.product_megadongle);
+
+ if (want_product == Altos.product_altimeter)
+ return matchProduct(Altos.product_telemetrum) ||
+ matchProduct(Altos.product_megametrum);
int have_product = getProduct();
int have_product = getProduct();