X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltos.java;h=73dc7468e532d101e879a28e1740c1577359ff1f;hp=364908448e2d2fcbdab39d32f71abf0f74281394;hb=9f5623c8c32a38eaeb63fa74ab370025ac015d52;hpb=72575dcb9cfbb5c1ccdb3510b9962a6f60ca3fa3

diff --git a/altosui/Altos.java b/altosui/Altos.java
index 36490844..73dc7468 100644
--- a/altosui/Altos.java
+++ b/altosui/Altos.java
@@ -70,11 +70,25 @@ public class Altos {
 
 	/* Telemetry modes */
 	static final int ao_telemetry_off = 0;
-	static final int ao_telemetry_legacy = 1;
-	static final int ao_telemetry_split = 2;
+	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_split_len = 32;
-	static final int ao_telemetry_legacy_len = 95;
+	static final int[] ao_telemetry_len = {
+		0, 32, 95, 94
+	};
 
 	static HashMap<String,Integer>	string_to_state = new HashMap<String,Integer>();
 
@@ -86,7 +100,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()
 	{
@@ -103,6 +117,20 @@ public class Altos {
 		map_initialized = true;
 	}
 
+	static int telemetry_len(int telemetry) {
+		if (telemetry <= ao_telemetry_max)
+			return ao_telemetry_len[telemetry];
+		throw new IllegalArgumentException(String.format("Invalid telemetry %d",
+								 telemetry));
+	}
+
+	static String telemetry_name(int telemetry) {
+		if (telemetry <= ao_telemetry_max)
+			return ao_telemetry_name[telemetry];
+		throw new IllegalArgumentException(String.format("Invalid telemetry %d",
+								 telemetry));
+	}
+	
 	static String[] state_to_string = {
 		"startup",
 		"idle",
@@ -116,6 +144,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();
@@ -324,50 +365,42 @@ public class Altos {
 	}
 
 	static int usb_vendor_altusmetrum() {
-		if (load_library())
-			return libaltosConstants.USB_VENDOR_ALTUSMETRUM;
-		return 0x000a;
+		load_library();
+		return 0xfffe;
 	}
 
 	static int usb_product_altusmetrum() {
-		if (load_library())
-			return libaltosConstants.USB_PRODUCT_ALTUSMETRUM;
+		load_library();
 		return 0x000a;
 	}
 
 	static int usb_product_altusmetrum_min() {
-		if (load_library())
-			return libaltosConstants.USB_PRODUCT_ALTUSMETRUM_MIN;
+		load_library();
 		return 0x000a;
 	}
 
 	static int usb_product_altusmetrum_max() {
-		if (load_library())
-			return libaltosConstants.USB_PRODUCT_ALTUSMETRUM_MAX;
-		return 0x000d;
+		load_library();
+		return 0x0013;
 	}
 
 	static int usb_product_telemetrum() {
-		if (load_library())
-			return libaltosConstants.USB_PRODUCT_TELEMETRUM;
+		load_library();
 		return 0x000b;
 	}
 
 	static int usb_product_teledongle() {
-		if (load_library())
-			return libaltosConstants.USB_PRODUCT_TELEDONGLE;
+		load_library();
 		return 0x000c;
 	}
 
 	static int usb_product_teleterra() {
-		if (load_library())
-			return libaltosConstants.USB_PRODUCT_TELETERRA;
+		load_library();
 		return 0x000d;
 	}
 
 	static int usb_product_telebt() {
-		if (load_library())
-			return libaltosConstants.USB_PRODUCT_TELEBT;
+		load_library();
 		return 0x000e;
 	}
 
@@ -384,12 +417,11 @@ public class Altos {
 	public final static int product_basestation = 0x10000 + 1;
 
 	static String bt_product_telebt() {
-		if (load_library())
-			return libaltosConstants.BLUETOOTH_PRODUCT_TELEBT;
+		load_library();
 		return "TeleBT";
 	}
 
 	public final static String bt_product_telebt = bt_product_telebt();
 
-	public static AltosBTKnown bt_known = new AltosBTKnown();
+//	public static AltosBTKnown bt_known = new AltosBTKnown();
 }