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

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index a4afd269..6c1729df 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_7;
+package org.altusmetrum.altoslib_11;
 
 import java.util.*;
 import java.io.*;
@@ -37,6 +38,20 @@ public class AltosLib {
 	public static final int AO_LOG_GPS_DATE = 'Y';
 	public static final int AO_LOG_PRESSURE = 'P';
 
+	public static boolean is_gps_cmd(int cmd) {
+		switch (cmd) {
+		case AltosLib.AO_LOG_GPS_POS:
+		case AltosLib.AO_LOG_GPS_TIME:
+		case AltosLib.AO_LOG_GPS_LAT:
+		case AltosLib.AO_LOG_GPS_LON:
+		case AltosLib.AO_LOG_GPS_ALT:
+		case AltosLib.AO_LOG_GPS_SAT:
+		case AltosLib.AO_LOG_GPS_DATE:
+			return true;
+		}
+		return false;
+	}
+
 	/* Added for header fields in eeprom files */
 	public static final int AO_LOG_CONFIG_VERSION = 1000;
 	public static final int AO_LOG_MAIN_DEPLOY = 1001;
@@ -161,6 +176,16 @@ public class AltosLib {
 		return product_any;
 	}
 
+	public static boolean has_9dof(int device_type) {
+		return device_type == product_telemega || device_type == product_easymega;
+	}
+
+	public static boolean has_gps(int device_type) {
+		return device_type == product_telemetrum ||
+			device_type == product_telemega ||
+			device_type == product_telegps;
+	}
+
 	/* Bluetooth "identifier" (bluetooth sucks) */
 	public final static String bt_product_telebt = "TeleBT";
 
@@ -198,6 +223,7 @@ public class AltosLib {
 	};
 
 	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;
@@ -330,9 +356,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) {
@@ -492,9 +521,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 == '-') {
@@ -555,7 +585,31 @@ public class AltosLib {
 		}
 	}
 
-	public static String ignitor_name(int i) {
+	public static String igniter_name(int i) {
 		return String.format("Ignitor %c", 'A' + i);
 	}
+
+	public static AltosRecordSet record_set(File file) throws FileNotFoundException, IOException {
+		FileInputStream in;
+		in = new FileInputStream(file);
+		if (file.getName().endsWith("telem")) {
+			return new AltosTelemetryFile(in);
+		} else if (file.getName().endsWith("eeprom")) {
+			return new AltosEepromFile(in);
+		} else {
+			String	name = file.getName();
+			int	dot = name.lastIndexOf('.');
+			String	extension;
+
+			if (dot == -1)
+				throw new IOException(String.format("%s (Missing extension)", file.toString()));
+			else {
+				extension = name.substring(dot);
+				throw new IOException(String.format("%s (Invalid extension '%s')",
+								    file.toString(),
+								    extension));
+			}
+		}
+	}
+
 }