altosui: Add bluetooth bits back in

[fw/altos] / altosui / Altos.java

diff --git a/altosui/Altos.java b/altosui/Altos.java
index 73dc7468e532d101e879a28e1740c1577359ff1f..aa2fd77af1df35b7d44cee6fe4c6c973eb4d474c 100644 (file)
--- a/altosui/Altos.java
+++ b/altosui/Altos.java
@@ -51,6 +51,7 @@ public class Altos {
        static final int AO_LOG_MANUFACTURER = 2000;
        static final int AO_LOG_PRODUCT = 2001;
        static final int AO_LOG_SERIAL_NUMBER = 2002;
+       static final int AO_LOG_LOG_FORMAT = 2003;
        static final int AO_LOG_SOFTWARE_VERSION = 9999;
 
        /* Added to flag invalid records */
@@ -96,9 +97,45 @@ public class Altos {
 
        static final int tab_elt_pad = 5;
 
-       static final Font label_font = new Font("Dialog", Font.PLAIN, 22);
-       static final Font value_font = new Font("Monospaced", Font.PLAIN, 22);
-       static final Font status_font = new Font("SansSerif", Font.BOLD, 24);
+       static Font label_font;
+       static Font value_font;
+       static Font status_font;
+       static Font table_label_font;
+       static Font table_value_font;
+
+       final static int font_size_small = 1;
+       final static int font_size_medium = 2;
+       final static int font_size_large = 3;
+
+       static void set_fonts(int size) {
+               int     brief_size;
+               int     table_size;
+               int     status_size;
+
+               switch (size) {
+               case font_size_small:
+                       brief_size = 16;
+                       status_size = 18;
+                       table_size = 11;
+                       break;
+               default:
+               case font_size_medium:
+                       brief_size = 22;
+                       status_size = 24;
+                       table_size = 14;
+                       break;
+               case font_size_large:
+                       brief_size = 26;
+                       status_size = 30;
+                       table_size = 17;
+                       break;
+               }
+               label_font = new Font("Dialog", Font.PLAIN, brief_size);
+               value_font = new Font("Monospaced", Font.PLAIN, brief_size);
+               status_font = new Font("SansSerif", Font.BOLD, status_size);
+               table_label_font = new Font("SansSerif", Font.PLAIN, table_size);
+               table_value_font = new Font("Monospaced", Font.PLAIN, table_size);
+       }
 
        static final int text_width = 20;
 
@@ -111,6 +148,7 @@ public class Altos {
                string_to_state.put("fast", ao_flight_fast);
                string_to_state.put("coast", ao_flight_coast);
                string_to_state.put("drogue", ao_flight_drogue);
+               string_to_state.put("apogee", ao_flight_coast);
                string_to_state.put("main", ao_flight_main);
                string_to_state.put("landed", ao_flight_landed);
                string_to_state.put("invalid", ao_flight_invalid);
@@ -177,6 +215,13 @@ public class Altos {
        static final int AO_GPS_NUM_SAT_SHIFT = 0;
        static final int AO_GPS_NUM_SAT_MASK = 0xf;
 
+       static final int AO_LOG_FORMAT_UNKNOWN = 0;
+       static final int AO_LOG_FORMAT_FULL = 1;
+       static final int AO_LOG_FORMAT_TINY = 2;
+       static final int AO_LOG_FORMAT_TELEMETRY = 3;
+       static final int AO_LOG_FORMAT_TELESCIENCE = 4;
+       static final int AO_LOG_FORMAT_NONE = 127;
+
        static boolean isspace(int c) {
                switch (c) {
                case ' ':
@@ -357,7 +402,13 @@ public class Altos {
                                libaltos.altos_init();
                                loaded_library = true;
                        } catch (UnsatisfiedLinkError e) {
-                               loaded_library = false;
+                               try {
+                                       System.loadLibrary("altos64");
+                                       libaltos.altos_init();
+                                       loaded_library = true;
+                               } catch (UnsatisfiedLinkError e2) {
+                                       loaded_library = false;
+                               }
                        }
                        initialized = true;
                }
@@ -404,12 +455,36 @@ public class Altos {
                return 0x000e;
        }
 
+       static int usb_product_telelaunch() {
+               load_library();
+               return 0x000f;
+       }
+
+       static int usb_product_telelco() {
+               load_library();
+               return 0x0010;
+       }
+
+       static int usb_product_telescience() {
+               load_library();
+               return 0x0011;
+       }
+
+       static int usb_product_telepyro() {
+               load_library();
+               return 0x0012;
+       }
+
        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_telelaunch = usb_product_telelaunch();
+       public final static int product_tele10 = usb_product_telelco();
+       public final static int product_telescience = usb_product_telescience();
+       public final static int product_telepyro = usb_product_telepyro();
        public final static int product_altusmetrum_min = usb_product_altusmetrum_min();
        public final static int product_altusmetrum_max = usb_product_altusmetrum_max();
 
@@ -423,5 +498,5 @@ public class Altos {
 
        public final static String bt_product_telebt = bt_product_telebt();
 
-//     public static AltosBTKnown bt_known = new AltosBTKnown();
+       public static AltosBTKnown bt_known = new AltosBTKnown();
 }