X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltos.java;h=d221077e290d542596354313e98cfdaa099a34dd;hp=9d5b2e02369d3eef870ac083be1fd881f2c31e04;hb=84163eee7847a09fe78f8762b28f857d76bf5755;hpb=7f5b5848ad6ef5c808638a29c3dc0101b56ed11e

diff --git a/altosui/Altos.java b/altosui/Altos.java
index 9d5b2e02..d221077e 100644
--- a/altosui/Altos.java
+++ b/altosui/Altos.java
@@ -21,6 +21,8 @@ import java.awt.*;
 import java.util.*;
 import java.text.*;
 
+import libaltosJNI.*;
+
 public class Altos {
 	/* EEProm command letters */
 	static final int AO_LOG_FLIGHT = 'F';
@@ -34,6 +36,7 @@ public class Altos {
 	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_HEIGHT = 'h';
 
 	/* Added for header fields in eeprom files */
 	static final int AO_LOG_CONFIG_VERSION = 1000;
@@ -43,10 +46,11 @@ public class Altos {
 	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_MANUFACTURER = 1007;
-	static final int AO_LOG_PRODUCT = 1008;
-	static final int AO_LOG_SERIAL_NUMBER = 1009;
-	static final int AO_LOG_SOFTWARE_VERSION = 1010;
+	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_SOFTWARE_VERSION = 9999;
 
 	/* Added to flag invalid records */
 	static final int AO_LOG_INVALID = -1;
@@ -220,4 +224,89 @@ public class Altos {
 			input = input.substring(0,dot);
 		return input.concat(extension);
 	}
+
+	static public boolean initialized = false;
+	static public boolean loaded_library = false;
+
+	public static boolean load_library() {
+		if (!initialized) {
+			try {
+				System.loadLibrary("altos");
+				libaltos.altos_init();
+				loaded_library = true;
+			} catch (UnsatisfiedLinkError e) {
+				loaded_library = false;
+			}
+			initialized = true;
+		}
+		return loaded_library;
+	}
+
+	static int usb_vendor_altusmetrum() {
+		if (load_library())
+			return libaltosConstants.USB_VENDOR_ALTUSMETRUM;
+		return 0x000a;
+	}
+
+	static int usb_product_altusmetrum() {
+		if (load_library())
+			return libaltosConstants.USB_PRODUCT_ALTUSMETRUM;
+		return 0x000a;
+	}
+
+	static int usb_product_altusmetrum_min() {
+		if (load_library())
+			return libaltosConstants.USB_PRODUCT_ALTUSMETRUM_MIN;
+		return 0x000a;
+	}
+
+	static int usb_product_altusmetrum_max() {
+		if (load_library())
+			return libaltosConstants.USB_PRODUCT_ALTUSMETRUM_MAX;
+		return 0x000d;
+	}
+
+	static int usb_product_telemetrum() {
+		if (load_library())
+			return libaltosConstants.USB_PRODUCT_TELEMETRUM;
+		return 0x000b;
+	}
+
+	static int usb_product_teledongle() {
+		if (load_library())
+			return libaltosConstants.USB_PRODUCT_TELEDONGLE;
+		return 0x000c;
+	}
+
+	static int usb_product_teleterra() {
+		if (load_library())
+			return libaltosConstants.USB_PRODUCT_TELETERRA;
+		return 0x000d;
+	}
+
+	static int usb_product_telebt() {
+		if (load_library())
+			return libaltosConstants.USB_PRODUCT_TELEBT;
+		return 0x000e;
+	}
+
+	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_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() {
+		if (load_library())
+			return libaltosConstants.BLUETOOTH_PRODUCT_TELEBT;
+		return "TeleBT";
+	}
+
+	public final static String bt_product_telebt = bt_product_telebt();
 }