X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosLib.java;h=69c6d604003d7ff39bacba50b7affb14270c1d73;hb=debian;hp=07ed31e1997c50aae4f73027f82ee3c6ffbad610;hpb=81b1c60faefc6b6101597a3e09cf76f5c31178da;p=fw%2Faltos

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index 07ed31e1..fbbfd63c 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;
@@ -386,6 +393,9 @@ public class AltosLib {
 	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_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;
@@ -394,6 +404,7 @@ public class AltosLib {
 	public static final int	model_bmx160 = 3;
 	public static final int model_hmc5883 = 4;
 	public static final int model_mmc5983 = 5;
+	public static final int model_bmi088 = 6;
 
 	public static boolean isspace(int c) {
 		switch (c) {
@@ -612,11 +623,68 @@ 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";
 		}
 	}
 
+	public static int product_id_from_log_format(int log_format) {
+		switch (log_format){
+		case AO_LOG_FORMAT_UNKNOWN:
+			return product_altusmetrum;
+		case AO_LOG_FORMAT_FULL:
+			return product_telemetrum;
+		case AO_LOG_FORMAT_TINY:
+			return product_telemini;
+		case AO_LOG_FORMAT_TELEMETRY:
+			return product_altusmetrum;
+		case AO_LOG_FORMAT_TELESCIENCE:
+			return product_telescience;
+		case AO_LOG_FORMAT_TELEMEGA_OLD:
+			return product_telemega;
+		case AO_LOG_FORMAT_EASYMINI1:
+			return product_easymini;
+		case AO_LOG_FORMAT_TELEMETRUM:
+			return product_telemetrum;
+		case AO_LOG_FORMAT_TELEMINI2:
+			return product_telemini;
+		case AO_LOG_FORMAT_TELEGPS:
+			return product_telegps;
+		case AO_LOG_FORMAT_TELEMEGA:
+			return product_telemega;
+		case AO_LOG_FORMAT_DETHERM:
+			return product_altusmetrum;
+		case AO_LOG_FORMAT_TELEMINI3:
+			return product_telemini;
+		case AO_LOG_FORMAT_TELEFIRETWO:
+			return product_altusmetrum;
+		case AO_LOG_FORMAT_EASYMINI2:
+			return product_easymini;
+		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;
+		case AO_LOG_FORMAT_MICROPEAK2:
+			return product_altusmetrum;
+		case AO_LOG_FORMAT_TELEMEGA_4:
+			return product_telemega;
+		case AO_LOG_FORMAT_EASYMOTOR:
+			return product_easymotor;
+		case AO_LOG_FORMAT_TELEMEGA_5:
+			return product_telemega;
+		case AO_LOG_FORMAT_TELEMEGA_6:
+			return product_telemega;
+		case AO_LOG_FORMAT_NONE:
+			return product_altusmetrum;
+		default:
+			return product_altusmetrum;
+		}
+	}
+
 	public static String igniter_name(int i) {
 		return String.format("Igniter %c", 'A' + i);
 	}