X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosLib.java;h=46031912858b4950de3876b0956ab4fe43b3d2a6;hp=b3fe2968eeb466f472a3028e1edc68bac09e5e51;hb=2449d123690746d0d0d5d66dfc4d3a05b9f5dc0c;hpb=5a3c5de6657d1c26e52015a8acec0cd05e294cef

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index b3fe2968..46031912 100644
--- 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;
+package org.altusmetrum.altoslib_2;
 
 import java.util.*;
 import java.io.*;
@@ -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;
@@ -62,6 +63,8 @@ public class AltosLib {
 
 	public static final int AO_LOG_SOFTWARE_VERSION = 9999;
 
+	public final static int	MISSING = 0x7fffffff;
+
 	/* Added to flag invalid records */
 	public static final int AO_LOG_INVALID = -1;
 
@@ -89,10 +92,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 +220,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) {
@@ -405,4 +414,28 @@ 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));
+	}
+
+	public static String product_name(int product_id) {
+		switch (product_id) {
+		case product_altusmetrum: return "AltusMetrum";
+		case product_telemetrum: return "TeleMetrum";
+		case product_teledongle: return "TeleDongle";
+		case product_teleterra: return "TeleTerra";
+		case product_telebt: return "TeleBT";
+		case product_telelaunch: return "TeleLaunch";
+		case product_telelco: return "TeleLco";
+		case product_telescience: return "Telescience";
+		case product_telepyro: return "TelePyro";
+		case product_telemega: return "TeleMega";
+		case product_megadongle: return "MegaDongle";
+		case product_telegps: return "TeleGPS";
+		case product_easymini: return "EasyMini";
+		case product_telemini: return "TeleMini";
+		default: return "unknown";
+		}
+	}
 }