X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosLib.java;h=02e632c12a1ddea6f1e75fd6b56f6b1198b0092d;hp=6c1729dfc03a32a51f64f3d8fbf2eabf092ec652;hb=fb167d9f589d3e42e0f99b9f454a51a31e09050a;hpb=da914cd72411af8c36af05b13c11b9093c8a378c

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index 6c1729df..02e632c1 100644
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_13;
 
 import java.util.*;
 import java.io.*;
@@ -180,6 +180,10 @@ public class AltosLib {
 		return device_type == product_telemega || device_type == product_easymega;
 	}
 
+	public static boolean has_radio(int device_type) {
+		return device_type != product_easymini && device_type != product_easymega;
+	}
+
 	public static boolean has_gps(int device_type) {
 		return device_type == product_telemetrum ||
 			device_type == product_telemega ||
@@ -222,10 +226,13 @@ public class AltosLib {
 		"Compressed", "Uncompressed"
 	};
 
-	public static final String launch_sites_url = "http://www.altusmetrum.org/AltOS/launch-sites.txt";
+	public static final String launch_sites_url = "http://maps.altusmetrum.org/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 String unit_info_url = "https://altusmetrum.org/cgi-bin/unitinfo.cgi?sn=%d";
+	public static final String unit_info_env = "UNIT_INFO";
+
 	public static final int ao_telemetry_standard_len = 32;
 	public static final int ao_telemetry_0_9_len = 95;
 	public static final int ao_telemetry_0_8_len = 94;
@@ -348,13 +355,16 @@ public class AltosLib {
 	public static final int AO_GPS_NUM_SAT_SHIFT = 0;
 	public static final int AO_GPS_NUM_SAT_MASK = 0xf;
 
+	public static final int AO_PAD_ORIENTATION_ANTENNA_UP = 0;
+	public static final int AO_PAD_ORIENTATION_ANTENNA_DOWN = 1;
+
 	public static final int AO_LOG_FORMAT_UNKNOWN = 0;
 	public static final int AO_LOG_FORMAT_FULL = 1;
 	public static final int AO_LOG_FORMAT_TINY = 2;
 	public static final int AO_LOG_FORMAT_TELEMETRY = 3;
 	public static final int AO_LOG_FORMAT_TELESCIENCE = 4;
 	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_EASYMINI1 = 6;
 	public static final int AO_LOG_FORMAT_TELEMETRUM = 7;
 	public static final int AO_LOG_FORMAT_TELEMINI2 = 8;
 	public static final int AO_LOG_FORMAT_TELEGPS = 9;
@@ -362,6 +372,8 @@ public class AltosLib {
 	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_EASYMINI2 = 14;
+	public static final int AO_LOG_FORMAT_TELEMEGA_3 = 15;
 	public static final int AO_LOG_FORMAT_NONE = 127;
 
 	public static boolean isspace(int c) {
@@ -586,7 +598,11 @@ public class AltosLib {
 	}
 
 	public static String igniter_name(int i) {
-		return String.format("Ignitor %c", 'A' + i);
+		return String.format("Igniter %c", 'A' + i);
+	}
+
+	public static String igniter_short_name(int i) {
+		return String.format("igniter_%c", 'a' + i);
 	}
 
 	public static AltosRecordSet record_set(File file) throws FileNotFoundException, IOException {