projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
altosui
/
AltosUSBDevice.java
diff --git
a/altosui/AltosUSBDevice.java
b/altosui/AltosUSBDevice.java
index b11a3934b1376906974eab03cdf02b8c698f3817..0c953cbf377629a3ab4e18d568e261358d7a8b4a 100644
(file)
--- a/
altosui/AltosUSBDevice.java
+++ b/
altosui/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
altosui
;
+package
AltosUI
;
import java.lang.*;
import java.util.*;
import libaltosJNI.*;
import java.lang.*;
import java.util.*;
import libaltosJNI.*;
@@
-71,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();