altoslib: Improve performance of AltosLib.hexbytes

[fw/altos] / altoslib / AltosLib.java

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index efbc3ddbe69c15f57bee5ae272673d2749c14b77..c3c1226ed4ec7a4ec8a8412e71ac763232140c01 100644 (file)
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_5;
 
 import java.util.*;
 import java.io.*;
@@ -51,6 +51,20 @@ public class AltosLib {
        public static final int AO_LOG_SERIAL_NUMBER = 2002;
        public static final int AO_LOG_LOG_FORMAT = 2003;
 
+       public static final int AO_LOG_FREQUENCY = 2004;
+       public static final int AO_LOG_APOGEE_LOCKOUT = 2005;
+       public static final int AO_LOG_RADIO_RATE = 2006;
+       public static final int AO_LOG_IGNITE_MODE = 2007;
+       public static final int AO_LOG_PAD_ORIENTATION = 2008;
+       public static final int AO_LOG_RADIO_ENABLE = 2009;
+       public static final int AO_LOG_AES_KEY = 2010;
+       public static final int AO_LOG_APRS = 2011;
+       public static final int AO_LOG_BEEP_SETTING = 2012;
+       public static final int AO_LOG_TRACKER_SETTING = 2013;
+       public static final int AO_LOG_PYRO_TIME = 2014;
+       public static final int AO_LOG_APRS_ID = 2015;
+       public static final int AO_LOG_ALTITUDE_32 = 2016;
+
        /* Added for header fields in telemega files */
        public static final int AO_LOG_BARO_RESERVED = 3000;
        public static final int AO_LOG_BARO_SENS = 3001;
@@ -79,6 +93,7 @@ public class AltosLib {
        public static final int ao_flight_main = 7;
        public static final int ao_flight_landed = 8;
        public static final int ao_flight_invalid = 9;
+       public static final int ao_flight_stateless = 10;
 
        /* USB product IDs */
        public final static int vendor_altusmetrum = 0xfffe;
@@ -160,6 +175,15 @@ public class AltosLib {
                "Off", "Standard Telemetry", "TeleMetrum v0.9", "TeleMetrum v0.8"
        };
 
+       public static final int ao_telemetry_rate_38400 = 0;
+       public static final int ao_telemetry_rate_9600 = 1;
+       public static final int ao_telemetry_rate_2400 = 2;
+       public static final int ao_telemetry_rate_max = 2;
+
+       public static final Integer[] ao_telemetry_rate_values = {
+               38400, 9600, 2400
+       };
+
        public static final String launch_sites_url = "http://www.altusmetrum.org/AltOS/launch-sites.txt";
 
        public static final int ao_telemetry_standard_len = 32;
@@ -187,6 +211,7 @@ public class AltosLib {
                string_to_state.put("main", ao_flight_main);
                string_to_state.put("landed", ao_flight_landed);
                string_to_state.put("invalid", ao_flight_invalid);
+               string_to_state.put("stateless", ao_flight_stateless);
                map_initialized = true;
        }
 
@@ -203,7 +228,32 @@ public class AltosLib {
                throw new IllegalArgumentException(String.format("Invalid telemetry %d",
                                                                 telemetry));
        }
-       
+
+       private static int[] split_version(String version) {
+               String[] tokens = version.split("\\.");
+               int[] ret = new int[tokens.length];
+               for (int i = 0; i < tokens.length; i++)
+                       ret[i] = Integer.parseInt(tokens[i]);
+               return ret;
+       }
+
+       public static int compare_version(String version_a, String version_b) {
+               int[] a = split_version(version_a);
+               int[] b = split_version(version_b);
+
+               for (int i = 0; i < Math.min(a.length, b.length); i++) {
+                       if (a[i] < b[i])
+                               return -1;
+                       if (a[i] > b[i])
+                               return 1;
+               }
+               if (a.length < b.length)
+                       return -1;
+               if (a.length > b.length)
+                       return 1;
+               return 0;
+       }
+
        private static String[] state_to_string = {
                "startup",
                "idle",
@@ -215,6 +265,7 @@ public class AltosLib {
                "main",
                "landed",
                "invalid",
+               "stateless",
        };
 
        private static String[] state_to_string_capital = {
@@ -228,6 +279,7 @@ public class AltosLib {
                "Main",
                "Landed",
                "Invalid",
+               "Stateless",
        };
 
        public static int state(String state) {
@@ -265,6 +317,7 @@ public class AltosLib {
        public static final int AO_LOG_FORMAT_EASYMINI = 6;
        public static final int AO_LOG_FORMAT_TELEMETRUM = 7;
        public static final int AO_LOG_FORMAT_TELEMINI = 8;
+       public static final int AO_LOG_FORMAT_TELEGPS = 9;
        public static final int AO_LOG_FORMAT_NONE = 127;
 
        public static boolean isspace(int c) {
@@ -276,7 +329,7 @@ public class AltosLib {
                return false;
        }
 
-       public static boolean ishex(int c) {
+       public static final boolean ishex(int c) {
                if ('0' <= c && c <= '9')
                        return true;
                if ('a' <= c && c <= 'f')
@@ -286,7 +339,7 @@ public class AltosLib {
                return false;
        }
 
-       public static boolean ishex(String s) {
+       public static final boolean ishex(String s) {
                for (int i = 0; i < s.length(); i++)
                        if (!ishex(s.charAt(i)))
                                return false;
@@ -410,10 +463,17 @@ public class AltosLib {
 
                if ((s.length() & 1) != 0)
                        throw new NumberFormatException(String.format("invalid line \"%s\"", s));
-               n = s.length() / 2;
+               byte[] bytes = s.getBytes(unicode_set);
+               n = bytes.length / 2;
                r = new int[n];
-               for (i = 0; i < n; i++)
-                       r[i] = hexbyte(s, i * 2);
+               for (i = 0; i < n; i++) {
+                       int h = fromhex(bytes[(i << 1)]);
+                       int l = fromhex(bytes[(i << 1) + 1]);
+                       if (h < 0 || l < 0)
+                               throw new NumberFormatException(String.format("invalid hex \"%c%c\"",
+                                                                             bytes[(i<<1)], bytes[(i<<1) + 1]));
+                       r[i] = (h << 4) + l;
+               }
                return r;
        }
 
@@ -479,4 +539,8 @@ public class AltosLib {
                default: return "unknown";
                }
        }
+
+       public static String ignitor_name(int i) {
+               return String.format("Ignitor %c", 'A' + i);
+       }
 }