altoslib: Support multiple telemetry rates

[fw/altos] / altoslib / AltosLib.java

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index 05f0af8df5d4fa518191dc7e1a96c88c0e4772a1..c2ec0e3bb1a3af007093832fe2cf6d859e9e1c41 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_3;
+package org.altusmetrum.altoslib_5;
 
 import java.util.*;
 import java.io.*;
@@ -79,6 +79,7 @@ public class AltosLib {
        public static final int ao_flight_main = 7;
        public static final int ao_flight_landed = 8;
        public static final int ao_flight_invalid = 9;
+       public static final int ao_flight_stateless = 10;
 
        /* USB product IDs */
        public final static int vendor_altusmetrum = 0xfffe;
@@ -160,6 +161,15 @@ public class AltosLib {
                "Off", "Standard Telemetry", "TeleMetrum v0.9", "TeleMetrum v0.8"
        };
 
+       public static final int ao_telemetry_rate_38400 = 0;
+       public static final int ao_telemetry_rate_9600 = 1;
+       public static final int ao_telemetry_rate_2400 = 2;
+       public static final int ao_telemetry_rate_max = 2;
+
+       public static final Integer[] ao_telemetry_rate_values = {
+               38400, 9600, 2400
+       };
+
        public static final String launch_sites_url = "http://www.altusmetrum.org/AltOS/launch-sites.txt";
 
        public static final int ao_telemetry_standard_len = 32;
@@ -187,6 +197,7 @@ public class AltosLib {
                string_to_state.put("main", ao_flight_main);
                string_to_state.put("landed", ao_flight_landed);
                string_to_state.put("invalid", ao_flight_invalid);
+               string_to_state.put("stateless", ao_flight_stateless);
                map_initialized = true;
        }
 
@@ -203,7 +214,7 @@ public class AltosLib {
                throw new IllegalArgumentException(String.format("Invalid telemetry %d",
                                                                 telemetry));
        }
-       
+
        private static String[] state_to_string = {
                "startup",
                "idle",
@@ -215,6 +226,7 @@ public class AltosLib {
                "main",
                "landed",
                "invalid",
+               "stateless",
        };
 
        private static String[] state_to_string_capital = {
@@ -228,6 +240,7 @@ public class AltosLib {
                "Main",
                "Landed",
                "Invalid",
+               "Stateless",
        };
 
        public static int state(String state) {
@@ -265,6 +278,7 @@ public class AltosLib {
        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_NONE = 127;
 
        public static boolean isspace(int c) {
@@ -479,4 +493,8 @@ public class AltosLib {
                default: return "unknown";
                }
        }
+
+       public static String ignitor_name(int i) {
+               return String.format("Ignitor %c", 'A' + i);
+       }
 }