X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosLib.java;h=69c6d604003d7ff39bacba50b7affb14270c1d73;hp=46031912858b4950de3876b0956ab4fe43b3d2a6;hb=ff13cf1359e1f4ae33b16a5867fd364993566b65;hpb=488a527267decece48e6682e0e0c7fc29cbed329

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index 46031912..69c6d604 100644
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_4;
 
 import java.util.*;
 import java.io.*;
@@ -79,6 +79,7 @@ public class AltosLib {
 	public static final int ao_flight_main = 7;
 	public static final int ao_flight_landed = 8;
 	public static final int ao_flight_invalid = 9;
+	public static final int ao_flight_stateless = 10;
 
 	/* USB product IDs */
 	public final static int vendor_altusmetrum = 0xfffe;
@@ -104,9 +105,50 @@ public class AltosLib {
 	public final static int product_basestation = 0x10000 + 1;
 	public final static int product_altimeter = 0x10000 + 2;
 
+	private static class Product {
+		final String	name;
+		final int	product;
+
+		Product (String name, int product) {
+			this.name = name;
+			this.product = product;
+		}
+	}
+
+	private static Product[] products = {
+		new Product("telemetrum", product_telemetrum),
+		new Product("teleballoon", product_telemetrum),
+		new Product("teledongle", product_teledongle),
+		new Product("teleterra", product_teledongle),
+		new Product("telebt", product_telebt),
+		new Product("telelaunch", product_telelaunch),
+		new Product("telelco", product_telelco),
+		new Product("telescience", product_telescience),
+		new Product("telepyro", product_telepyro),
+		new Product("telemega", product_telemega),
+		new Product("megadongle", product_megadongle),
+		new Product("telegps", product_telegps),
+		new Product("easymini", product_easymini),
+		new Product("telemini", product_telemini)
+	};
+
+	public static int name_to_product(String name) {
+		String low = name.toLowerCase();
+
+		for (int i = 0; i < products.length; i++)
+			if (low.startsWith(products[i].name))
+				return products[i].product;
+		return product_any;
+	}
+
 	/* Bluetooth "identifier" (bluetooth sucks) */
 	public final static String bt_product_telebt = "TeleBT";
 
+	/* "good" voltages */
+
+	public final static double ao_battery_good = 3.8;
+	public final static double ao_igniter_good = 3.5;
+
 	/* Telemetry modes */
 	public static final int ao_telemetry_off = 0;
 	public static final int ao_telemetry_min = 1;
@@ -146,6 +188,7 @@ public class AltosLib {
 		string_to_state.put("main", ao_flight_main);
 		string_to_state.put("landed", ao_flight_landed);
 		string_to_state.put("invalid", ao_flight_invalid);
+		string_to_state.put("stateless", ao_flight_stateless);
 		map_initialized = true;
 	}
 
@@ -162,7 +205,7 @@ public class AltosLib {
 		throw new IllegalArgumentException(String.format("Invalid telemetry %d",
 								 telemetry));
 	}
-	
+
 	private static String[] state_to_string = {
 		"startup",
 		"idle",
@@ -174,6 +217,7 @@ public class AltosLib {
 		"main",
 		"landed",
 		"invalid",
+		"stateless",
 	};
 
 	private static String[] state_to_string_capital = {
@@ -187,6 +231,7 @@ public class AltosLib {
 		"Main",
 		"Landed",
 		"Invalid",
+		"Stateless",
 	};
 
 	public static int state(String state) {
@@ -224,6 +269,7 @@ public class AltosLib {
 	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_TELEGPS = 9;
 	public static final int AO_LOG_FORMAT_NONE = 127;
 
 	public static boolean isspace(int c) {
@@ -438,4 +484,8 @@ public class AltosLib {
 		default: return "unknown";
 		}
 	}
+
+	public static String ignitor_name(int i) {
+		return String.format("Ignitor %c", 'A' + i);
+	}
 }