X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosLib.java;h=a3f164d48827ecee6d5278c86863d063582edf07;hb=217d77dadbef4192d2f32e290a5c5f50159f2e0d;hp=0edc0b43537588c7a17c6c7a63b4a84f98385f66;hpb=00ae706dab6e8fddef4c5730a17c433a022228b7;p=fw%2Faltos

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index 0edc0b43..a3f164d4 100644
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_5;
+package org.altusmetrum.altoslib_11;
 
 import java.util.*;
 import java.io.*;
@@ -114,6 +115,9 @@ public class AltosLib {
 	public final static int product_easymini = 0x0026;
 	public final static int product_telemini = 0x0027;
 	public final static int product_easymega = 0x0028;
+	public final static int product_usbtrng = 0x0029;
+	public final static int product_usbrelay = 0x002a;
+	public final static int product_mpusb = 0x002b;
 	public final static int product_altusmetrum_min = 0x000a;
 	public final static int product_altusmetrum_max = 0x002c;
 
@@ -187,7 +191,16 @@ public class AltosLib {
 		38400, 9600, 2400
 	};
 
+	public static final int ao_aprs_format_compressed = 0;
+	public static final int ao_aprs_format_uncompressed = 1;
+
+	public static final String[] ao_aprs_format_name = {
+		"Compressed", "Uncompressed"
+	};
+
 	public static final String launch_sites_url = "http://www.altusmetrum.org/AltOS/launch-sites.txt";
+	public static final String launch_sites_env = "LAUNCH_SITES";
+//	public static final String launch_sites_url = "file:///home/keithp/misc/text/altusmetrum/AltOS/launch-sites.txt";
 
 	public static final int ao_telemetry_standard_len = 32;
 	public static final int ao_telemetry_0_9_len = 95;
@@ -319,9 +332,12 @@ public class AltosLib {
 	public static final int AO_LOG_FORMAT_TELEMEGA_OLD = 5;
 	public static final int AO_LOG_FORMAT_EASYMINI = 6;
 	public static final int AO_LOG_FORMAT_TELEMETRUM = 7;
-	public static final int AO_LOG_FORMAT_TELEMINI = 8;
+	public static final int AO_LOG_FORMAT_TELEMINI2 = 8;
 	public static final int AO_LOG_FORMAT_TELEGPS = 9;
 	public static final int AO_LOG_FORMAT_TELEMEGA = 10;
+	public static final int AO_LOG_FORMAT_DETHERM = 11;
+	public static final int AO_LOG_FORMAT_TELEMINI3 = 12;
+	public static final int AO_LOG_FORMAT_TELEFIRETWO = 13;
 	public static final int AO_LOG_FORMAT_NONE = 127;
 
 	public static boolean isspace(int c) {
@@ -481,9 +497,10 @@ public class AltosLib {
 		return r;
 	}
 
-	public static int fromdec(String s) throws NumberFormatException {
-		int c, v = 0;
-		int sign = 1;
+	public static long fromdec(String s) throws NumberFormatException {
+		int c;
+		long v = 0;
+		long sign = 1;
 		for (int i = 0; i < s.length(); i++) {
 			c = s.charAt(i);
 			if (i == 0 && c == '-') {