X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosLib.java;h=47c10cbf2fdac279f9a9cfe4b4607c221d691421;hb=bcc15fb429724956e72f06a4f4b1002b1def7a94;hp=cf1fa1ed4e9b096949f83502a0fcdd67bd9210c0;hpb=29c5336f775eacbfee354000c8b28de1813ede81;p=fw%2Faltos

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index cf1fa1ed..47c10cbf 100644
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -385,8 +385,16 @@ public class AltosLib {
 	public static final int AO_LOG_FORMAT_MICROPEAK2 = 18;
 	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_NONE = 127;
 
+	public static final int	model_mpu6000 = 0;
+	public static final int	model_mpu9250 = 1;
+	public static final int	model_adxl375 = 2;
+	public static final int	model_bmx160 = 3;
+	public static final int model_hmc5883 = 4;
+	public static final int model_mmc5983 = 5;
+
 	public static boolean isspace(int c) {
 		switch (c) {
 		case ' ':
@@ -609,6 +617,59 @@ public class AltosLib {
 		}
 	}
 
+	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:
+			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_NONE:
+			return product_altusmetrum;
+		default:
+			return product_altusmetrum;
+		}
+	}
+
 	public static String igniter_name(int i) {
 		return String.format("Igniter %c", 'A' + i);
 	}