X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosLib.java;h=07ed31e1997c50aae4f73027f82ee3c6ffbad610;hb=HEAD;hp=5293badce58eee47e6fb109741e7caced1e2be04;hpb=ee49d3c202e1fee14328006e2beb2e774313de2e;p=fw%2Faltos

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index 5293badc..dd2a4bae 100644
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -140,6 +140,13 @@ public class AltosLib {
 	public final static int product_basestation = 0x10000 + 1;
 	public final static int product_altimeter = 0x10000 + 2;
 
+	public final static int gps_builtin = 0;
+	public final static int gps_mosaic = 1;
+
+	public final static String[] gps_receiver_names = {
+		"Builtin", "Mosaic-X5"
+	};
+
 	private static class Product {
 		final String	name;
 		final int	product;
@@ -228,6 +235,30 @@ public class AltosLib {
 		"Compressed", "Uncompressed"
 	};
 
+	public static final String[] ignite_mode_values = {
+		"Dual Deploy",
+		"Redundant Apogee",
+		"Redundant Main",
+		"Separation & Apogee",
+	};
+
+	public static final String[] 	pad_orientation_values_radio = {
+		"Antenna Up",
+		"Antenna Down",
+	};
+
+	public static final String[] 	pad_orientation_values_no_radio = {
+		"Beeper Up",
+		"Beeper Down",
+	};
+
+	public static String[] pad_orientation_values(boolean radio) {
+		if (radio)
+			return pad_orientation_values_radio;
+		else
+			return pad_orientation_values_no_radio;
+	}
+
 	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";
@@ -387,6 +418,8 @@ public class AltosLib {
 	public static final int AO_LOG_FORMAT_EASYMOTOR = 20;
 	public static final int AO_LOG_FORMAT_TELEMEGA_5 = 21;
 	public static final int AO_LOG_FORMAT_TELEMEGA_6 = 22;
+	public static final int AO_LOG_FORMAT_EASYTIMER_2 = 23;
+	public static final int AO_LOG_FORMAT_EASYMEGA_3 = 24;
 	public static final int AO_LOG_FORMAT_NONE = 127;
 
 	public static final int	model_mpu6000 = 0;
@@ -614,6 +647,7 @@ public class AltosLib {
 		case product_telegps: return "TeleGPS";
 		case product_easymini: return "EasyMini";
 		case product_telemini: return "TeleMini";
+		case product_easymega: return "EasyMega";
 		case product_easymotor: return "EasyMotor";
 		default: return "unknown";
 		}
@@ -654,6 +688,7 @@ public class AltosLib {
 		case AO_LOG_FORMAT_TELEMEGA_3:
 			return product_telemega;
 		case AO_LOG_FORMAT_EASYMEGA_2:
+		case AO_LOG_FORMAT_EASYMEGA_3:
 			return product_easymega;
 		case AO_LOG_FORMAT_TELESTATIC:
 			return product_altusmetrum;