projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'mjb/altosdroid'
[fw/altos]
/
altosui
/
AltosUSBDevice.java
diff --git
a/altosui/AltosUSBDevice.java
b/altosui/AltosUSBDevice.java
index b11a3934b1376906974eab03cdf02b8c698f3817..3af7a7fa4895d952af6dd60328c91cb6cb90b187 100644
(file)
--- a/
altosui/AltosUSBDevice.java
+++ b/
altosui/AltosUSBDevice.java
@@
-16,7
+16,6
@@
*/
package altosui;
*/
package altosui;
-import java.lang.*;
import java.util.*;
import libaltosJNI.*;
import java.util.*;
import libaltosJNI.*;
@@
-71,7
+70,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();