altosui: Standard text field in flight UI needs more width (now 20)
[fw/altos] / altosui / Altos.java
index 5df004c5b0dfda75b127eaab5429eb3901beba7a..1acce9492a4c96b08bdbef5f8de6719f514be35e 100644 (file)
@@ -20,6 +20,7 @@ package altosui;
 import java.awt.*;
 import java.util.*;
 import java.text.*;
+import java.nio.charset.Charset;
 
 import libaltosJNI.*;
 
@@ -36,7 +37,7 @@ public class Altos {
        static final int AO_LOG_GPS_ALT = 'H';
        static final int AO_LOG_GPS_SAT = 'V';
        static final int AO_LOG_GPS_DATE = 'Y';
-       static final int AO_LOG_HEIGHT = 'h';
+       static final int AO_LOG_PRESSURE = 'P';
 
        /* Added for header fields in eeprom files */
        static final int AO_LOG_CONFIG_VERSION = 1000;
@@ -69,8 +70,23 @@ public class Altos {
 
        /* Telemetry modes */
        static final int ao_telemetry_off = 0;
-       static final int ao_telemetry_full = 1;
-       static final int ao_telemetry_tiny = 2;
+       static final int ao_telemetry_min = 1;
+       static final int ao_telemetry_standard = 1;
+       static final int ao_telemetry_0_9 = 2;
+       static final int ao_telemetry_0_8 = 3;
+       static final int ao_telemetry_max = 3;
+
+       static final String[] ao_telemetry_name = {
+               "Off", "Standard Telemetry", "TeleMetrum v0.9", "TeleMetrum v0.8"
+       };
+
+       static final int ao_telemetry_standard_len = 32;
+       static final int ao_telemetry_0_9_len = 95;
+       static final int ao_telemetry_0_8_len = 94;
+
+       static final int[] ao_telemetry_len = {
+               0, 32, 95, 94
+       };
 
        static HashMap<String,Integer>  string_to_state = new HashMap<String,Integer>();
 
@@ -82,7 +98,7 @@ public class Altos {
        static final Font value_font = new Font("Monospaced", Font.PLAIN, 22);
        static final Font status_font = new Font("SansSerif", Font.BOLD, 24);
 
-       static final int text_width = 16;
+       static final int text_width = 20;
 
        static void initialize_map()
        {
@@ -99,6 +115,20 @@ public class Altos {
                map_initialized = true;
        }
 
+       static int telemetry_len(int telemetry) {
+               if (telemetry <= ao_telemetry_max)
+                       return ao_telemetry_len[telemetry];
+               throw new IllegalArgumentException(String.format("Invalid telemetry %d",
+                                                                telemetry));
+       }
+
+       static String telemetry_name(int telemetry) {
+               if (telemetry <= ao_telemetry_max)
+                       return ao_telemetry_name[telemetry];
+               throw new IllegalArgumentException(String.format("Invalid telemetry %d",
+                                                                telemetry));
+       }
+       
        static String[] state_to_string = {
                "startup",
                "idle",
@@ -201,6 +231,83 @@ public class Altos {
                return -1;
        }
 
+       static int int8(int[] bytes, int i) {
+               return (int) (byte) bytes[i];
+       }
+
+       static int uint8(int[] bytes, int i) {
+               return bytes[i];
+       }
+
+       static int int16(int[] bytes, int i) {
+               return (int) (short) (bytes[i] + (bytes[i+1] << 8));
+       }
+
+       static int uint16(int[] bytes, int i) {
+               return bytes[i] + (bytes[i+1] << 8);
+       }
+
+       static int uint32(int[] bytes, int i) {
+               return bytes[i] +
+                       (bytes[i+1] << 8) +
+                       (bytes[i+2] << 16) +
+                       (bytes[i+3] << 24);
+       }
+
+       static final Charset    unicode_set = Charset.forName("UTF-8");
+
+       static String string(int[] bytes, int s, int l) {
+               if (s + l > bytes.length) {
+                       if (s > bytes.length) {
+                               s = bytes.length;
+                               l = 0;
+                       } else {
+                               l = bytes.length - s;
+                       }
+               }
+
+               int i;
+               for (i = l - 1; i >= 0; i--)
+                       if (bytes[s+i] != 0)
+                               break;
+
+               l = i + 1;
+               byte[]  b = new byte[l];
+
+               for (i = 0; i < l; i++)
+                       b[i] = (byte) bytes[s+i];
+               String n = new String(b, unicode_set);
+               return n;
+       }
+
+       static int hexbyte(String s, int i) {
+               int c0, c1;
+
+               if (s.length() < i + 2)
+                       throw new NumberFormatException(String.format("invalid hex \"%s\"", s));
+               c0 = s.charAt(i);
+               if (!Altos.ishex(c0))
+                       throw new NumberFormatException(String.format("invalid hex \"%c\"", c0));
+               c1 = s.charAt(i+1);
+               if (!Altos.ishex(c1))
+                       throw new NumberFormatException(String.format("invalid hex \"%c\"", c1));
+               return Altos.fromhex(c0) * 16 + Altos.fromhex(c1);
+       }
+
+       static int[] hexbytes(String s) {
+               int     n;
+               int[]   r;
+               int     i;
+
+               if ((s.length() & 1) != 0)
+                       throw new NumberFormatException(String.format("invalid line \"%s\"", s));
+               n = s.length() / 2;
+               r = new int[n];
+               for (i = 0; i < n; i++)
+                       r[i] = Altos.hexbyte(s, i * 2);
+               return r;
+       }
+
        static int fromdec(String s) throws NumberFormatException {
                int c, v = 0;
                int sign = 1;
@@ -243,50 +350,42 @@ public class Altos {
        }
 
        static int usb_vendor_altusmetrum() {
-               if (load_library())
-                       return libaltosConstants.USB_VENDOR_ALTUSMETRUM;
-               return 0x000a;
+               load_library();
+               return 0xfffe;
        }
 
        static int usb_product_altusmetrum() {
-               if (load_library())
-                       return libaltosConstants.USB_PRODUCT_ALTUSMETRUM;
+               load_library();
                return 0x000a;
        }
 
        static int usb_product_altusmetrum_min() {
-               if (load_library())
-                       return libaltosConstants.USB_PRODUCT_ALTUSMETRUM_MIN;
+               load_library();
                return 0x000a;
        }
 
        static int usb_product_altusmetrum_max() {
-               if (load_library())
-                       return libaltosConstants.USB_PRODUCT_ALTUSMETRUM_MAX;
-               return 0x000d;
+               load_library();
+               return 0x0013;
        }
 
        static int usb_product_telemetrum() {
-               if (load_library())
-                       return libaltosConstants.USB_PRODUCT_TELEMETRUM;
+               load_library();
                return 0x000b;
        }
 
        static int usb_product_teledongle() {
-               if (load_library())
-                       return libaltosConstants.USB_PRODUCT_TELEDONGLE;
+               load_library();
                return 0x000c;
        }
 
        static int usb_product_teleterra() {
-               if (load_library())
-                       return libaltosConstants.USB_PRODUCT_TELETERRA;
+               load_library();
                return 0x000d;
        }
 
        static int usb_product_telebt() {
-               if (load_library())
-                       return libaltosConstants.USB_PRODUCT_TELEBT;
+               load_library();
                return 0x000e;
        }
 
@@ -301,4 +400,13 @@ public class Altos {
 
        public final static int product_any = 0x10000;
        public final static int product_basestation = 0x10000 + 1;
+
+       static String bt_product_telebt() {
+               load_library();
+               return "TeleBT";
+       }
+
+       public final static String bt_product_telebt = bt_product_telebt();
+
+       public static AltosBTKnown bt_known = new AltosBTKnown();
 }