X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosLib.java;h=47c10cbf2fdac279f9a9cfe4b4607c221d691421;hb=76f0fe177a38bd16e346edf0808ee8fca343f1a2;hp=14cec543eb5f9d9dc374250b4a034be338ea2aa1;hpb=76b288f8d02e0a48f04de9455a2dd0b77e48bd63;p=fw%2Faltos

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index 14cec543..47c10cbf 100644
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -117,7 +117,7 @@ public class AltosLib {
 	public final static int product_altusmetrum = 0x000a;
 	public final static int product_telemetrum = 0x000b;
 	public final static int product_teledongle = 0x000c;
-	public final static int product_teleterra = 0x000d;
+	public final static int product_easytimer = 0x000d;
 	public final static int product_telebt = 0x000e;
 	public final static int product_telelaunch = 0x000f;
 	public final static int product_telelco = 0x0010;
@@ -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;
 
@@ -153,7 +154,7 @@ public class AltosLib {
 		new Product("telemetrum", product_telemetrum),
 		new Product("teleballoon", product_telemetrum),
 		new Product("teledongle", product_teledongle),
-		new Product("teleterra", product_teledongle),
+		new Product("easytimer", product_easytimer),
 		new Product("telebt", product_telebt),
 		new Product("telelaunch", product_telelaunch),
 		new Product("telelco", product_telelco),
@@ -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) {
@@ -357,6 +359,10 @@ public class AltosLib {
 
 	public static final int AO_PAD_ORIENTATION_ANTENNA_UP = 0;
 	public static final int AO_PAD_ORIENTATION_ANTENNA_DOWN = 1;
+	public static final int AO_PAD_ORIENTATION_WORDS_UPRIGHT = 2;
+	public static final int AO_PAD_ORIENTATION_WORDS_UPSIDEDOWN = 3;
+	public static final int AO_PAD_ORIENTATION_BIG_PARTS_UP = 4;
+	public static final int AO_PAD_ORIENTATION_BIG_PARTS_DOWN = 5;
 
 	public static final int AO_LOG_FORMAT_UNKNOWN = 0;
 	public static final int AO_LOG_FORMAT_FULL = 1;
@@ -378,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 ' ':
@@ -586,7 +601,7 @@ public class AltosLib {
 		case product_altusmetrum: return "AltusMetrum";
 		case product_telemetrum: return "TeleMetrum";
 		case product_teledongle: return "TeleDongle";
-		case product_teleterra: return "TeleTerra";
+		case product_easytimer: return "EasyTimer";
 		case product_telebt: return "TeleBT";
 		case product_telelaunch: return "TeleLaunch";
 		case product_telelco: return "TeleLco";
@@ -597,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);
 	}