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

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index 2402331e..192c445e 100644
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -17,9 +17,7 @@
 
 package org.altusmetrum.AltosLib;
 
-import java.awt.*;
 import java.util.*;
-import java.text.*;
 import java.io.*;
 import java.nio.charset.Charset;
 
@@ -111,7 +109,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 +119,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 +157,7 @@ public class AltosLib {
 								 telemetry));
 	}
 	
-	public static String[] state_to_string = {
+	private static String[] state_to_string = {
 		"startup",
 		"idle",
 		"pad",
@@ -172,7 +170,7 @@ public class AltosLib {
 		"invalid",
 	};
 
-	public static String[] state_to_string_capital = {
+	private static String[] state_to_string_capital = {
 		"Startup",
 		"Idle",
 		"Pad",
@@ -199,6 +197,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);