altoslib: Store saved state in version-independent format

[fw/altos] / altoslib / AltosLib.java

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index 0edc0b43537588c7a17c6c7a63b4a84f98385f66..044caf8de1ca2d144de41bb20e44544b8d0e1e84 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_11;
 
 import java.util.*;
 import java.io.*;
@@ -114,6 +114,9 @@ public class AltosLib {
        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;
 
@@ -187,7 +190,16 @@ 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_env = "LAUNCH_SITES";
+//     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;
@@ -481,9 +493,10 @@ public class AltosLib {
                return r;
        }
 
-       public static int fromdec(String s) throws NumberFormatException {
-               int c, v = 0;
-               int sign = 1;
+       public static long fromdec(String s) throws NumberFormatException {
+               int c;
+               long v = 0;
+               long sign = 1;
                for (int i = 0; i < s.length(); i++) {
                        c = s.charAt(i);
                        if (i == 0 && c == '-') {