altosui/telegps: Add config option for APRS format

[fw/altos] / altoslib / AltosLib.java

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index eb188d6b5a7c3be8b2585bacf1853dfc5a852951..405a3accf1bb433dc112913358738635eff7526b 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_5;
+package org.altusmetrum.altoslib_6;
 
 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;
@@ -60,6 +74,7 @@ public class AltosLib {
        public static final int AO_LOG_BARO_TREF = 3006;
        public static final int AO_LOG_BARO_TEMPSENS = 3007;
        public static final int AO_LOG_BARO_CRC = 3008;
+       public static final int AO_LOG_IMU_CAL = 3009;
 
        public static final int AO_LOG_SOFTWARE_VERSION = 9999;
 
@@ -98,6 +113,10 @@ public class AltosLib {
        public final static int product_telegps = 0x0025;
        public final static int product_easymini = 0x0026;
        public final static int product_telemini = 0x0027;
+       public final static int product_easymega = 0x0028;
+       public final static int product_usbtrng = 0x0029;
+       public final static int product_usbrelay = 0x002a;
+       public final static int product_mpusb = 0x002b;
        public final static int product_altusmetrum_min = 0x000a;
        public final static int product_altusmetrum_max = 0x002c;
 
@@ -129,7 +148,8 @@ public class AltosLib {
                new Product("megadongle", product_megadongle),
                new Product("telegps", product_telegps),
                new Product("easymini", product_easymini),
-               new Product("telemini", product_telemini)
+               new Product("telemini", product_telemini),
+               new Product("easymega", product_easymega)
        };
 
        public static int name_to_product(String name) {
@@ -170,7 +190,15 @@ public class AltosLib {
                38400, 9600, 2400
        };
 
+       public static final int ao_aprs_format_compressed = 0;
+       public static final int ao_aprs_format_uncompressed = 1;
+
+       public static final String[] ao_aprs_format_name = {
+               "Compressed", "Uncompressed"
+       };
+
        public static final String launch_sites_url = "http://www.altusmetrum.org/AltOS/launch-sites.txt";
+//     public static final String launch_sites_url = "file:///home/keithp/misc/text/altusmetrum/AltOS/launch-sites.txt";
 
        public static final int ao_telemetry_standard_len = 32;
        public static final int ao_telemetry_0_9_len = 95;
@@ -299,11 +327,12 @@ public class AltosLib {
        public static final int AO_LOG_FORMAT_TINY = 2;
        public static final int AO_LOG_FORMAT_TELEMETRY = 3;
        public static final int AO_LOG_FORMAT_TELESCIENCE = 4;
-       public static final int AO_LOG_FORMAT_TELEMEGA = 5;
+       public static final int AO_LOG_FORMAT_TELEMEGA_OLD = 5;
        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_TELEMEGA = 10;
        public static final int AO_LOG_FORMAT_NONE = 127;
 
        public static boolean isspace(int c) {
@@ -315,7 +344,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 +354,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 +478,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;
        }