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

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index a7f27830..47c10cbf 100644
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -132,6 +132,7 @@ public class AltosLib {
 	public final static int product_usbtrng = 0x0029;
 	public final static int product_usbrelay = 0x002a;
 	public final static int product_mpusb = 0x002b;
+	public final static int product_easymotor = 0x002c;
 	public final static int product_altusmetrum_min = 0x000a;
 	public final static int product_altusmetrum_max = 0x002c;
 
@@ -164,7 +165,8 @@ public class AltosLib {
 		new Product("telegps", product_telegps),
 		new Product("easymini", product_easymini),
 		new Product("telemini", product_telemini),
-		new Product("easymega", product_easymega)
+		new Product("easymega", product_easymega),
+		new Product("easymotor", product_easymotor)
 	};
 
 	public static int name_to_product(String name) {
@@ -382,8 +384,17 @@ public class AltosLib {
 	public static final int AO_LOG_FORMAT_TELESTATIC = 17;
 	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 ' ':
@@ -601,10 +612,64 @@ public class AltosLib {
 		case product_telegps: return "TeleGPS";
 		case product_easymini: return "EasyMini";
 		case product_telemini: return "TeleMini";
+		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:
+			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);
 	}