X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosLib.java;h=cf1fa1ed4e9b096949f83502a0fcdd67bd9210c0;hb=3ed101d634968666cd3ee2d8c49737970caf406b;hp=d1063509b2d4e1efda7ebfce2a1eca76032d6200;hpb=c8dbcaf69cd538a31ab6e2b568237ae7c8656a9a;p=fw%2Faltos

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index d1063509..cf1fa1ed 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_12;
+package org.altusmetrum.altoslib_14;
 
 import java.util.*;
 import java.io.*;
@@ -117,7 +117,7 @@ public class AltosLib {
 	public final static int product_altusmetrum = 0x000a;
 	public final static int product_telemetrum = 0x000b;
 	public final static int product_teledongle = 0x000c;
-	public final static int product_teleterra = 0x000d;
+	public final static int product_easytimer = 0x000d;
 	public final static int product_telebt = 0x000e;
 	public final static int product_telelaunch = 0x000f;
 	public final static int product_telelco = 0x0010;
@@ -132,6 +132,7 @@ public class AltosLib {
 	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_easymotor = 0x002c;
 	public final static int product_altusmetrum_min = 0x000a;
 	public final static int product_altusmetrum_max = 0x002c;
 
@@ -153,7 +154,7 @@ public class AltosLib {
 		new Product("telemetrum", product_telemetrum),
 		new Product("teleballoon", product_telemetrum),
 		new Product("teledongle", product_teledongle),
-		new Product("teleterra", product_teledongle),
+		new Product("easytimer", product_easytimer),
 		new Product("telebt", product_telebt),
 		new Product("telelaunch", product_telelaunch),
 		new Product("telelco", product_telelco),
@@ -164,7 +165,8 @@ public class AltosLib {
 		new Product("telegps", product_telegps),
 		new Product("easymini", product_easymini),
 		new Product("telemini", product_telemini),
-		new Product("easymega", product_easymega)
+		new Product("easymega", product_easymega),
+		new Product("easymotor", product_easymotor)
 	};
 
 	public static int name_to_product(String name) {
@@ -180,6 +182,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 +228,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 = "https://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,6 +357,13 @@ 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_PAD_ORIENTATION_WORDS_UPRIGHT = 2;
+	public static final int AO_PAD_ORIENTATION_WORDS_UPSIDEDOWN = 3;
+	public static final int AO_PAD_ORIENTATION_BIG_PARTS_UP = 4;
+	public static final int AO_PAD_ORIENTATION_BIG_PARTS_DOWN = 5;
+
 	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;
@@ -363,6 +379,12 @@ public class AltosLib {
 	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_EASYMEGA_2 = 16;
+	public static final int AO_LOG_FORMAT_TELESTATIC = 17;
+	public static final int AO_LOG_FORMAT_MICROPEAK2 = 18;
+	public static final int AO_LOG_FORMAT_TELEMEGA_4 = 19;
+	public static final int AO_LOG_FORMAT_EASYMOTOR = 20;
 	public static final int AO_LOG_FORMAT_NONE = 127;
 
 	public static boolean isspace(int c) {
@@ -571,7 +593,7 @@ public class AltosLib {
 		case product_altusmetrum: return "AltusMetrum";
 		case product_telemetrum: return "TeleMetrum";
 		case product_teledongle: return "TeleDongle";
-		case product_teleterra: return "TeleTerra";
+		case product_easytimer: return "EasyTimer";
 		case product_telebt: return "TeleBT";
 		case product_telelaunch: return "TeleLaunch";
 		case product_telelco: return "TeleLco";
@@ -582,12 +604,17 @@ public class AltosLib {
 		case product_telegps: return "TeleGPS";
 		case product_easymini: return "EasyMini";
 		case product_telemini: return "TeleMini";
+		case product_easymotor: return "EasyMotor";
 		default: return "unknown";
 		}
 	}
 
 	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 {