X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosLib.java;h=5293badce58eee47e6fb109741e7caced1e2be04;hb=38fac9fd1ebdc0900f598c859453b5fc8fc6b4a6;hp=07ed31e1997c50aae4f73027f82ee3c6ffbad610;hpb=47e98987fd8789583406eba7d2bc2d47bfad1f11;p=fw%2Faltos diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java index 07ed31e1..5293badc 100644 --- a/altoslib/AltosLib.java +++ b/altoslib/AltosLib.java @@ -386,6 +386,7 @@ 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_NONE = 127; public static final int model_mpu6000 = 0; @@ -394,6 +395,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) { @@ -617,6 +619,61 @@ 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_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); }