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 044caf8de1ca2d144de41bb20e44544b8d0e1e84..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
@@ -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";
 
@@ -331,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) {
@@ -557,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);
        }
 }