Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altoslib / AltosLib.java

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index 2e9dc6486a1907f2dc7027de20f3157adba84556..be69519b0e1d930fab525a8a738a5df2403083e8 100644 (file)
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -74,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;
 
@@ -187,6 +188,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_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;
@@ -315,11 +317,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) {