X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosLib.java;h=0b5475f790a38600f29862e609adc39aadbf1c07;hb=6592a5be127a9c95d3b2e7d5aa6ffba71c6748b9;hp=2402331e59351cde28a76ff9be2693a6ddd739cb;hpb=6f421818fd7062f03bfaf9e606d6a4cfdcb13b49;p=fw%2Faltos

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index 2402331e..0b5475f7 100644
--- 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;
 
@@ -93,8 +91,9 @@ public class AltosLib {
 	public final static int product_telepyro =0x0012;
 	public final static int product_megametrum = 0x0023;
 	public final static int product_megadongle = 0x0024;
+	public final static int product_telegps = 0x0025;
 	public final static int product_altusmetrum_min = 0x000a;
-	public final static int product_altusmetrum_max = 0x0024;
+	public final static int product_altusmetrum_max = 0x0025;
 
 	public final static int product_any = 0x10000;
 	public final static int product_basestation = 0x10000 + 1;
@@ -111,7 +110,7 @@ public class AltosLib {
 	public static final int ao_telemetry_0_8 = 3;
 	public static final int ao_telemetry_max = 3;
 
-	public static final String[] ao_telemetry_name = {
+	private static final String[] ao_telemetry_name = {
 		"Off", "Standard Telemetry", "TeleMetrum v0.9", "TeleMetrum v0.8"
 	};
 
@@ -121,13 +120,13 @@ public class AltosLib {
 	public static final int ao_telemetry_0_9_len = 95;
 	public static final int ao_telemetry_0_8_len = 94;
 
-	public static final int[] ao_telemetry_len = {
+	private static final int[] ao_telemetry_len = {
 		0, 32, 95, 94
 	};
 
-	public static HashMap<String,Integer>	string_to_state = new HashMap<String,Integer>();
+	private static HashMap<String,Integer>	string_to_state = new HashMap<String,Integer>();
 
-	public static boolean map_initialized = false;
+	private static boolean map_initialized = false;
 
 	public static void initialize_map()
 	{
@@ -159,7 +158,7 @@ public class AltosLib {
 								 telemetry));
 	}
 	
-	public static String[] state_to_string = {
+	private static String[] state_to_string = {
 		"startup",
 		"idle",
 		"pad",
@@ -172,7 +171,7 @@ public class AltosLib {
 		"invalid",
 	};
 
-	public static String[] state_to_string_capital = {
+	private static String[] state_to_string_capital = {
 		"Startup",
 		"Idle",
 		"Pad",
@@ -199,6 +198,12 @@ public class AltosLib {
 		return state_to_string[state];
 	}
 
+	public static String state_name_capital(int state) {
+		if (state < 0 || state_to_string.length <= state)
+			return "Invalid";
+		return state_to_string_capital[state];
+	}
+
 	public static final int AO_GPS_VALID = (1 << 4);
 	public static final int AO_GPS_RUNNING = (1 << 5);
 	public static final int AO_GPS_DATE_VALID = (1 << 6);
@@ -401,4 +406,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));
+	}
 }