X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryStandard.java;h=f4dfd8e9665953dc58987c972022e313bc176e27;hb=HEAD;hp=1718e4b771d16f785caaca23abc453a990823064;hpb=7600116a191b3ac252a0f716d200d0e0b3500987;p=fw%2Faltos diff --git a/altoslib/AltosTelemetryStandard.java b/altoslib/AltosTelemetryStandard.java index 1718e4b7..bea217c8 100644 --- a/altoslib/AltosTelemetryStandard.java +++ b/altoslib/AltosTelemetryStandard.java @@ -16,7 +16,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altoslib_11; +package org.altusmetrum.altoslib_14; public abstract class AltosTelemetryStandard extends AltosTelemetry { public int int8(int off) { @@ -75,8 +75,11 @@ public abstract class AltosTelemetryStandard extends AltosTelemetry { case packet_type_companion: telem = new AltosTelemetryCompanion(bytes); break; - case packet_type_mega_sensor: - telem = new AltosTelemetryMegaSensor(bytes); + case packet_type_mega_sensor_mpu: + telem = new AltosTelemetryMegaSensor(bytes, AltosIMU.imu_type_telemega_v3); + break; + case packet_type_mega_sensor_bmx160: + telem = new AltosTelemetryMegaSensor(bytes, AltosIMU.imu_type_telemega_v4); break; case packet_type_mega_data: telem = new AltosTelemetryMegaData(bytes); @@ -93,6 +96,12 @@ public abstract class AltosTelemetryStandard extends AltosTelemetry { case packet_type_mini3: telem = new AltosTelemetryMini3(bytes); break; + case packet_type_mega_norm_mpu6000_mmc5983: + telem = new AltosTelemetryMegaNorm(bytes, AltosLib.model_mpu6000, AltosLib.model_mmc5983); + break; + case packet_type_mega_norm_bmi088_mmc5983: + telem = new AltosTelemetryMegaNorm(bytes, AltosLib.model_bmi088, AltosLib.model_mmc5983); + break; default: telem = new AltosTelemetryRaw(bytes); break; @@ -104,7 +113,7 @@ public abstract class AltosTelemetryStandard extends AltosTelemetry { super(bytes); } - public void update_state(AltosState state) { - super.update_state(state); + public void provide_data(AltosDataListener listener) { + super.provide_data(listener); } }