altosui: Add TeleBT USB device support

TeleBT can work just like a TeleDongle over USB.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altosui/AltosDevice.java b/altosui/AltosDevice.java
index f0fda57bc0b825c71d4af0dfa08180e4b3d4899e..b7aa38f6f440feacb71f3a9eeec1b28a5a636b36 100644 (file)
--- a/altosui/AltosDevice.java
+++ b/altosui/AltosDevice.java
@@ -81,15 +81,21 @@ public class AltosDevice extends altos_device {
                return 0x000d;
        }
 
+       static int usb_product_telebt() {
+               if (load_library())
+                       return libaltosConstants.USB_PRODUCT_TELEBT;
+               return 0x000e;
+       }
+
        public final static int vendor_altusmetrum = usb_vendor_altusmetrum();
        public final static int product_altusmetrum = usb_product_altusmetrum();
        public final static int product_telemetrum = usb_product_telemetrum();
        public final static int product_teledongle = usb_product_teledongle();
        public final static int product_teleterra = usb_product_teleterra();
+       public final static int product_telebt = usb_product_telebt();
        public final static int product_altusmetrum_min = usb_product_altusmetrum_min();
        public final static int product_altusmetrum_max = usb_product_altusmetrum_max();
 
-
        public final static int product_any = 0x10000;
        public final static int product_basestation = 0x10000 + 1;
 
@@ -98,7 +104,7 @@ public class AltosDevice extends altos_device {
                if (name == null)
                        name = "Altus Metrum";
                return String.format("%-20.20s %4d %s",
-                                    getName(), getSerial(), getPath());
+                                    name, getSerial(), getPath());
        }
 
        public String toShortString() {
@@ -129,7 +135,9 @@ public class AltosDevice extends altos_device {
                        return true;
 
                if (want_product == product_basestation)
-                       return matchProduct(product_teledongle) || matchProduct(product_teleterra);
+                       return matchProduct(product_teledongle) ||
+                               matchProduct(product_teleterra) ||
+                               matchProduct(product_telebt);
 
                int have_product = getProduct();
 

diff --git a/altosui/libaltos/libaltos.h b/altosui/libaltos/libaltos.h
index 6e94899e8a1ec37e54319ccfa0c363c9dca3b0e2..0e5691cb87b8acd6e9649f819f97d4f673387b9e 100644 (file)
--- a/altosui/libaltos/libaltos.h
+++ b/altosui/libaltos/libaltos.h
@@ -40,6 +40,7 @@
 #define USB_PRODUCT_TELEMETRUM         0x000b
 #define USB_PRODUCT_TELEDONGLE         0x000c
 #define USB_PRODUCT_TELETERRA          0x000d
+#define USB_PRODUCT_TELEBT             0x000e
 #define USB_PRODUCT_ALTUSMETRUM_MIN    0x000a
 #define USB_PRODUCT_ALTUSMETRUM_MAX    0x0013