altoslib/altosuilib/altosui: More work towards using AltosFlightSeries for analysis

[fw/altos] / altoslib / AltosLib.java

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index a4afd2698edaab703ae464f08873e8e0ff5fe9bd..fb43ea206790371a96cc6c6144a9cbe0d59310dc 100644 (file)
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_11;
 
 import java.util.*;
 import java.io.*;
@@ -161,6 +162,16 @@ public class AltosLib {
                return product_any;
        }
 
+       public static boolean has_9dof(int device_type) {
+               return device_type == product_telemega || device_type == product_easymega;
+       }
+
+       public static boolean has_gps(int device_type) {
+               return device_type == product_telemetrum ||
+                       device_type == product_telemega ||
+                       device_type == product_telegps;
+       }
+
        /* Bluetooth "identifier" (bluetooth sucks) */
        public final static String bt_product_telebt = "TeleBT";
 
@@ -198,6 +209,7 @@ public class AltosLib {
        };
 
        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;
@@ -330,9 +342,12 @@ public class AltosLib {
        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_TELEMINI2 = 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_DETHERM = 11;
+       public static final int AO_LOG_FORMAT_TELEMINI3 = 12;
+       public static final int AO_LOG_FORMAT_TELEFIRETWO = 13;
        public static final int AO_LOG_FORMAT_NONE = 127;
 
        public static boolean isspace(int c) {
@@ -492,9 +507,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 == '-') {
@@ -555,7 +571,7 @@ public class AltosLib {
                }
        }
 
-       public static String ignitor_name(int i) {
+       public static String igniter_name(int i) {
                return String.format("Ignitor %c", 'A' + i);
        }
 }