altoslib/altosui: Further AltosState transition work

[fw/altos] / altoslib / AltosLib.java

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index 192da0a9d765982aedb019eaadb3f33aeecbd149..d6d78ca8ffc2dd68e1e80905ea5ad80605cda7d6 100644 (file)
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -28,6 +28,7 @@ public class AltosLib {
        public static final int AO_LOG_TEMP_VOLT = 'T';
        public static final int AO_LOG_DEPLOY = 'D';
        public static final int AO_LOG_STATE = 'S';
+       public static final int AO_LOG_GPS_POS = 'P';
        public static final int AO_LOG_GPS_TIME = 'G';
        public static final int AO_LOG_GPS_LAT = 'N';
        public static final int AO_LOG_GPS_LON = 'W';
@@ -50,7 +51,7 @@ public class AltosLib {
        public static final int AO_LOG_SERIAL_NUMBER = 2002;
        public static final int AO_LOG_LOG_FORMAT = 2003;
 
-       /* Added for header fields in megametrum files */
+       /* Added for header fields in telemega files */
        public static final int AO_LOG_BARO_RESERVED = 3000;
        public static final int AO_LOG_BARO_SENS = 3001;
        public static final int AO_LOG_BARO_OFF = 3002;
@@ -89,10 +90,13 @@ public class AltosLib {
        public final static int product_telelco = 0x0010;
        public final static int product_telescience = 0x0011;
        public final static int product_telepyro =0x0012;
-       public final static int product_megametrum = 0x0023;
+       public final static int product_telemega = 0x0023;
        public final static int product_megadongle = 0x0024;
+       public final static int product_telegps = 0x0025;
+       public final static int product_easymini = 0x0026;
+       public final static int product_telemini = 0x0027;
        public final static int product_altusmetrum_min = 0x000a;
-       public final static int product_altusmetrum_max = 0x0024;
+       public final static int product_altusmetrum_max = 0x002c;
 
        public final static int product_any = 0x10000;
        public final static int product_basestation = 0x10000 + 1;
@@ -214,7 +218,10 @@ 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_MEGAMETRUM = 5;
+       public static final int AO_LOG_FORMAT_TELEMEGA = 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_NONE = 127;
 
        public static boolean isspace(int c) {