X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltos.java;h=364908448e2d2fcbdab39d32f71abf0f74281394;hp=1f791da5b8b0f77b7c7dcd8f28ca5aa549d3c6fe;hb=41c230cac359b4459ca93196d08704b7d35447c7;hpb=a9df9fc257eb2d7038d66ac7c2539aae4474bf12

diff --git a/altosui/Altos.java b/altosui/Altos.java
index 1f791da5..36490844 100644
--- a/altosui/Altos.java
+++ b/altosui/Altos.java
@@ -20,6 +20,9 @@ package altosui;
 import java.awt.*;
 import java.util.*;
 import java.text.*;
+import java.nio.charset.Charset;
+
+import libaltosJNI.*;
 
 public class Altos {
 	/* EEProm command letters */
@@ -34,7 +37,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';
+	static final int AO_LOG_PRESSURE = 'P';
 
 	/* Added for header fields in eeprom files */
 	static final int AO_LOG_CONFIG_VERSION = 1000;
@@ -67,8 +70,11 @@ public class Altos {
 
 	/* Telemetry modes */
 	static final int ao_telemetry_off = 0;
-	static final int ao_telemetry_full = 1;
-	static final int ao_telemetry_tiny = 2;
+	static final int ao_telemetry_legacy = 1;
+	static final int ao_telemetry_split = 2;
+
+	static final int ao_telemetry_split_len = 32;
+	static final int ao_telemetry_legacy_len = 95;
 
 	static HashMap<String,Integer>	string_to_state = new HashMap<String,Integer>();
 
@@ -199,6 +205,83 @@ public class Altos {
 		return -1;
 	}
 
+	static int int8(int[] bytes, int i) {
+		return (int) (byte) bytes[i];
+	}
+
+	static int uint8(int[] bytes, int i) {
+		return bytes[i];
+	}
+
+	static int int16(int[] bytes, int i) {
+		return (int) (short) (bytes[i] + (bytes[i+1] << 8));
+	}
+
+	static int uint16(int[] bytes, int i) {
+		return bytes[i] + (bytes[i+1] << 8);
+	}
+
+	static int uint32(int[] bytes, int i) {
+		return bytes[i] +
+			(bytes[i+1] << 8) +
+			(bytes[i+2] << 16) +
+			(bytes[i+3] << 24);
+	}
+
+	static final Charset	unicode_set = Charset.forName("UTF-8");
+
+	static String string(int[] bytes, int s, int l) {
+		if (s + l > bytes.length) {
+			if (s > bytes.length) {
+				s = bytes.length;
+				l = 0;
+			} else {
+				l = bytes.length - s;
+			}
+		}
+
+		int i;
+		for (i = l - 1; i >= 0; i--)
+			if (bytes[s+i] != 0)
+				break;
+
+		l = i + 1;
+		byte[]	b = new byte[l];
+
+		for (i = 0; i < l; i++)
+			b[i] = (byte) bytes[s+i];
+		String n = new String(b, unicode_set);
+		return n;
+	}
+
+	static int hexbyte(String s, int i) {
+		int c0, c1;
+
+		if (s.length() < i + 2)
+			throw new NumberFormatException(String.format("invalid hex \"%s\"", s));
+		c0 = s.charAt(i);
+		if (!Altos.ishex(c0))
+			throw new NumberFormatException(String.format("invalid hex \"%c\"", c0));
+		c1 = s.charAt(i+1);
+		if (!Altos.ishex(c1))
+			throw new NumberFormatException(String.format("invalid hex \"%c\"", c1));
+		return Altos.fromhex(c0) * 16 + Altos.fromhex(c1);
+	}
+
+	static int[] hexbytes(String s) {
+		int	n;
+		int[]	r;
+		int	i;
+
+		if ((s.length() & 1) != 0)
+			throw new NumberFormatException(String.format("invalid line \"%s\"", s));
+		n = s.length() / 2;
+		r = new int[n];
+		for (i = 0; i < n; i++)
+			r[i] = Altos.hexbyte(s, i * 2);
+		return r;
+	}
+
 	static int fromdec(String s) throws NumberFormatException {
 		int c, v = 0;
 		int sign = 1;
@@ -222,4 +305,91 @@ 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();
+
+	public static AltosBTKnown bt_known = new AltosBTKnown();
 }