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

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index aec2c692..6c1729df 100644
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -38,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;
@@ -162,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";
 
@@ -337,6 +361,7 @@ public class AltosLib {
 	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) {
@@ -560,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));
+			}
+		}
+	}
+
 }