projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: gps serial routines are called ao_gps_*, not ao_ublox_*
[fw/altos]
/
altosuilib
/
AltosUSBDevice.java
diff --git
a/altosuilib/AltosUSBDevice.java
b/altosuilib/AltosUSBDevice.java
index 2f4e0dc67b422dc885cdc5ee3f7e2ebc9d042dcb..a06b686911423c1ad4aa1416f37124f8f6dbe665 100644
(file)
--- a/
altosuilib/AltosUSBDevice.java
+++ b/
altosuilib/AltosUSBDevice.java
@@
-15,7
+15,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altosuilib;
+package org.altusmetrum.altosuilib
_1
;
import java.util.*;
import libaltosJNI.*;
import java.util.*;
import libaltosJNI.*;
@@
-50,7
+50,7
@@
public class AltosUSBDevice extends altos_device implements AltosDevice {
return libaltos.altos_open(this);
}
return libaltos.altos_open(this);
}
- p
rivate
boolean isAltusMetrum() {
+ p
ublic
boolean isAltusMetrum() {
if (getVendor() != AltosUILib.vendor_altusmetrum)
return false;
if (getProduct() < AltosUILib.product_altusmetrum_min)
if (getVendor() != AltosUILib.vendor_altusmetrum)
return false;
if (getProduct() < AltosUILib.product_altusmetrum_min)
@@
-76,7
+76,8
@@
public class AltosUSBDevice extends altos_device implements AltosDevice {
if (want_product == AltosUILib.product_altimeter)
return matchProduct(AltosUILib.product_telemetrum) ||
if (want_product == AltosUILib.product_altimeter)
return matchProduct(AltosUILib.product_telemetrum) ||
- matchProduct(AltosUILib.product_megametrum);
+ matchProduct(AltosUILib.product_telemega) ||
+ matchProduct(AltosUILib.product_telegps);
int have_product = getProduct();
int have_product = getProduct();
@@
-89,7
+90,7
@@
public class AltosUSBDevice extends altos_device implements AltosDevice {
return false;
}
return false;
}
- static java.util.List<AltosDevice> list(int product) {
+ static
public
java.util.List<AltosDevice> list(int product) {
if (!AltosUILib.load_library())
return null;
if (!AltosUILib.load_library())
return null;
@@
-109,4
+110,4
@@
public class AltosUSBDevice extends altos_device implements AltosDevice {
return device_list;
}
return device_list;
}
-}
\ No newline at end of file
+}