Merge remote-tracking branch 'origin/master'

[fw/altos] / altoslib / AltosLib.java

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index d36b2ff789a313499c7655b5175ab1318548e09f..d60ef492ccffeb38d89f70d0b02b89e8306e4426 100644 (file)
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -15,11 +15,9 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_1;
 
-import java.awt.*;
 import java.util.*;
-import java.text.*;
 import java.io.*;
 import java.nio.charset.Charset;
 
@@ -52,7 +50,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;
@@ -91,10 +89,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;
@@ -201,7 +202,7 @@ public class AltosLib {
 
        public static String state_name_capital(int state) {
                if (state < 0 || state_to_string.length <= state)
-                       return "invalid";
+                       return "Invalid";
                return state_to_string_capital[state];
        }
 
@@ -216,7 +217,8 @@ 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_MINI = 6;
        public static final int AO_LOG_FORMAT_NONE = 127;
 
        public static boolean isspace(int c) {
@@ -407,4 +409,8 @@ public class AltosLib {
                        input = input.substring(0,dot);
                return input.concat(extension);
        }
+
+       public static File replace_extension(File input, String extension) {
+               return new File(replace_extension(input.getPath(), extension));
+       }
 }