altoslib: Improve performance of AltosLib.hexbytes

[fw/altos] / altoslib / AltosLib.java

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index eb188d6b5a7c3be8b2585bacf1853dfc5a852951..c3c1226ed4ec7a4ec8a8412e71ac763232140c01 100644 (file)
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -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;
@@ -315,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')
@@ -325,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;
@@ -449,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;
        }