X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltos.java;h=98af26bc3943c8e821ffb73a742dc88b6c47378b;hb=ce1b19a012a2c1c623b03efb93b881e297736718;hp=78e56970d7702669175f011baa79cc1a70f07ec1;hpb=b8c363d9411fd5e79e3f806894dbc12bcc106b88;p=fw%2Faltos

diff --git a/altosui/Altos.java b/altosui/Altos.java
index 78e56970..98af26bc 100644
--- a/altosui/Altos.java
+++ b/altosui/Altos.java
@@ -18,10 +18,6 @@
 package altosui;
 
 import java.awt.*;
-import java.util.*;
-import java.text.*;
-import java.nio.charset.Charset;
-
 import libaltosJNI.*;
 
 import org.altusmetrum.AltosLib.*;
@@ -72,20 +68,6 @@ public class Altos extends AltosLib {
 
 	static final int text_width = 20;
 
-	static public int state(String state) {
-		if (!map_initialized)
-			initialize_map();
-		if (string_to_state.containsKey(state))
-			return string_to_state.get(state);
-		return ao_flight_invalid;
-	}
-
-	static public String state_name(int state) {
-		if (state < 0 || state_to_string.length <= state)
-			return "invalid";
-		return state_to_string[state];
-	}
-
 	static public boolean initialized = false;
 	static public boolean loaded_library = false;
 
@@ -108,89 +90,4 @@ public class Altos extends AltosLib {
 		}
 		return loaded_library;
 	}
-
-	static int usb_vendor_altusmetrum() {
-		load_library();
-		return 0xfffe;
-	}
-
-	static int usb_product_altusmetrum() {
-		load_library();
-		return 0x000a;
-	}
-
-	static int usb_product_altusmetrum_min() {
-		load_library();
-		return 0x000a;
-	}
-
-	static int usb_product_altusmetrum_max() {
-		load_library();
-		return 0x0013;
-	}
-
-	static int usb_product_telemetrum() {
-		load_library();
-		return 0x000b;
-	}
-
-	static int usb_product_teledongle() {
-		load_library();
-		return 0x000c;
-	}
-
-	static int usb_product_teleterra() {
-		load_library();
-		return 0x000d;
-	}
-
-	static int usb_product_telebt() {
-		load_library();
-		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();
-
-	public final static int product_any = 0x10000;
-	public final static int product_basestation = 0x10000 + 1;
-
-	static String bt_product_telebt() {
-		load_library();
-		return "TeleBT";
-	}
-
-	public final static String bt_product_telebt = bt_product_telebt();
-
-	public static AltosBTKnown bt_known = new AltosBTKnown();
 }