X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltos.java;h=334ddb07c5ca5a6dd9c14975f3d0658d508f5570;hp=e4f974f9bedd22dc43b6aaf74a99052cc3133aa6;hb=f86dac643081987c8994ab57a96640d5e91b342a;hpb=cbfbaabb39f9f7709d00cf3dc63cc1bc7563062e

diff --git a/altosui/Altos.java b/altosui/Altos.java
index e4f974f9..334ddb07 100644
--- a/altosui/Altos.java
+++ b/altosui/Altos.java
@@ -24,76 +24,9 @@ import java.nio.charset.Charset;
 
 import libaltosJNI.*;
 
-public class Altos {
-	/* EEProm command letters */
-	static final int AO_LOG_FLIGHT = 'F';
-	static final int AO_LOG_SENSOR = 'A';
-	static final int AO_LOG_TEMP_VOLT = 'T';
-	static final int AO_LOG_DEPLOY = 'D';
-	static final int AO_LOG_STATE = 'S';
-	static final int AO_LOG_GPS_TIME = 'G';
-	static final int AO_LOG_GPS_LAT = 'N';
-	static final int AO_LOG_GPS_LON = 'W';
-	static final int AO_LOG_GPS_ALT = 'H';
-	static final int AO_LOG_GPS_SAT = 'V';
-	static final int AO_LOG_GPS_DATE = 'Y';
-	static final int AO_LOG_PRESSURE = 'P';
-
-	/* Added for header fields in eeprom files */
-	static final int AO_LOG_CONFIG_VERSION = 1000;
-	static final int AO_LOG_MAIN_DEPLOY = 1001;
-	static final int AO_LOG_APOGEE_DELAY = 1002;
-	static final int AO_LOG_RADIO_CHANNEL = 1003;
-	static final int AO_LOG_CALLSIGN = 1004;
-	static final int AO_LOG_ACCEL_CAL = 1005;
-	static final int AO_LOG_RADIO_CAL = 1006;
-	static final int AO_LOG_MAX_FLIGHT_LOG = 1007;
-	static final int AO_LOG_MANUFACTURER = 2000;
-	static final int AO_LOG_PRODUCT = 2001;
-	static final int AO_LOG_SERIAL_NUMBER = 2002;
-	static final int AO_LOG_LOG_FORMAT = 2003;
-	static final int AO_LOG_SOFTWARE_VERSION = 9999;
-
-	/* Added to flag invalid records */
-	static final int AO_LOG_INVALID = -1;
-
-	/* Flight state numbers and names */
-	static final int ao_flight_startup = 0;
-	static final int ao_flight_idle = 1;
-	static final int ao_flight_pad = 2;
-	static final int ao_flight_boost = 3;
-	static final int ao_flight_fast = 4;
-	static final int ao_flight_coast = 5;
-	static final int ao_flight_drogue = 6;
-	static final int ao_flight_main = 7;
-	static final int ao_flight_landed = 8;
-	static final int ao_flight_invalid = 9;
-
-	/* Telemetry modes */
-	static final int ao_telemetry_off = 0;
-	static final int ao_telemetry_min = 1;
-	static final int ao_telemetry_standard = 1;
-	static final int ao_telemetry_0_9 = 2;
-	static final int ao_telemetry_0_8 = 3;
-	static final int ao_telemetry_max = 3;
-
-	static final String[] ao_telemetry_name = {
-		"Off", "Standard Telemetry", "TeleMetrum v0.9", "TeleMetrum v0.8"
-	};
-
-	static final String launch_sites_url = "http://www.altusmetrum.org/AltOS/launch-sites.txt";
-
-	static final int ao_telemetry_standard_len = 32;
-	static final int ao_telemetry_0_9_len = 95;
-	static final int ao_telemetry_0_8_len = 94;
-
-	static final int[] ao_telemetry_len = {
-		0, 32, 95, 94
-	};
-
-	static HashMap<String,Integer>	string_to_state = new HashMap<String,Integer>();
+import org.altusmetrum.AltosLib.*;
 
-	static boolean map_initialized = false;
+public class Altos extends AltosLib {
 
 	static final int tab_elt_pad = 5;
 
@@ -220,6 +153,7 @@ public class Altos {
 	static final int AO_LOG_FORMAT_TINY = 2;
 	static final int AO_LOG_FORMAT_TELEMETRY = 3;
 	static final int AO_LOG_FORMAT_TELESCIENCE = 4;
+	static final int AO_LOG_FORMAT_MEGAMETRUM = 5;
 	static final int AO_LOG_FORMAT_NONE = 127;
 
 	static boolean isspace(int c) {
@@ -498,5 +432,5 @@ public class Altos {
 
 	public final static String bt_product_telebt = bt_product_telebt();
 
-//	public static AltosBTKnown bt_known = new AltosBTKnown();
+	public static AltosBTKnown bt_known = new AltosBTKnown();
 }