X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltos.java;h=ddf1005a3ed2aad1703a7290ab8905f86b9c79a4;hp=8d5916ad4653a2ebb553496739815541f9a27ab8;hb=393d231b9689cd1c358600ee76e0e808f89670c8;hpb=f7cd8317bf78ece334e1ceb0263b875ca43bbbd2

diff --git a/altosui/Altos.java b/altosui/Altos.java
index 8d5916ad..ddf1005a 100644
--- a/altosui/Altos.java
+++ b/altosui/Altos.java
@@ -51,6 +51,7 @@ public class Altos {
 	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 */
@@ -80,6 +81,8 @@ public class Altos {
 		"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;
@@ -98,7 +101,7 @@ public class Altos {
 	static final Font value_font = new Font("Monospaced", Font.PLAIN, 22);
 	static final Font status_font = new Font("SansSerif", Font.BOLD, 24);
 
-	static final int text_width = 16;
+	static final int text_width = 20;
 
 	static void initialize_map()
 	{
@@ -109,6 +112,7 @@ public class Altos {
 		string_to_state.put("fast", ao_flight_fast);
 		string_to_state.put("coast", ao_flight_coast);
 		string_to_state.put("drogue", ao_flight_drogue);
+		string_to_state.put("apogee", ao_flight_coast);
 		string_to_state.put("main", ao_flight_main);
 		string_to_state.put("landed", ao_flight_landed);
 		string_to_state.put("invalid", ao_flight_invalid);
@@ -142,6 +146,19 @@ public class Altos {
 		"invalid",
 	};
 
+	static String[] state_to_string_capital = {
+		"Startup",
+		"Idle",
+		"Pad",
+		"Boost",
+		"Fast",
+		"Coast",
+		"Drogue",
+		"Main",
+		"Landed",
+		"Invalid",
+	};
+
 	static public int state(String state) {
 		if (!map_initialized)
 			initialize_map();
@@ -162,6 +179,13 @@ public class Altos {
 	static final int AO_GPS_NUM_SAT_SHIFT = 0;
 	static final int AO_GPS_NUM_SAT_MASK = 0xf;
 
+	static final int AO_LOG_FORMAT_UNKNOWN = 0;
+	static final int AO_LOG_FORMAT_FULL = 1;
+	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_NONE = 127;
+
 	static boolean isspace(int c) {
 		switch (c) {
 		case ' ':
@@ -342,7 +366,13 @@ public class Altos {
 				libaltos.altos_init();
 				loaded_library = true;
 			} catch (UnsatisfiedLinkError e) {
-				loaded_library = false;
+				try {
+					System.loadLibrary("altos64");
+					libaltos.altos_init();
+					loaded_library = true;
+				} catch (UnsatisfiedLinkError e2) {
+					loaded_library = false;
+				}
 			}
 			initialized = true;
 		}
@@ -389,12 +419,36 @@ public class Altos {
 		return 0x000e;
 	}
 
+	static int usb_product_telelaunch() {
+		load_library();
+		return 0x000f;
+	}
+
+	static int usb_product_telelco() {
+		load_library();
+		return 0x0010;
+	}
+
+	static int usb_product_telescience() {
+		load_library();
+		return 0x0011;
+	}
+
+	static int usb_product_telepyro() {
+		load_library();
+		return 0x0012;
+	}
+
 	public final static int vendor_altusmetrum = usb_vendor_altusmetrum();
 	public final static int product_altusmetrum = usb_product_altusmetrum();
 	public final static int product_telemetrum = usb_product_telemetrum();
 	public final static int product_teledongle = usb_product_teledongle();
 	public final static int product_teleterra = usb_product_teleterra();
 	public final static int product_telebt = usb_product_telebt();
+	public final static int product_telelaunch = usb_product_telelaunch();
+	public final static int product_tele10 = usb_product_telelco();
+	public final static int product_telescience = usb_product_telescience();
+	public final static int product_telepyro = usb_product_telepyro();
 	public final static int product_altusmetrum_min = usb_product_altusmetrum_min();
 	public final static int product_altusmetrum_max = usb_product_altusmetrum_max();
 
@@ -408,5 +462,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();
 }