X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryMegaSensor.java;h=1b568c88cea80b47ca45bc6edc5d63559b32514d;hb=HEAD;hp=471e1787df1fd3eecbf494e99d672a8aa9c833b9;hpb=a5a8a4d8de49484a2edba62cc9b84377aa5415a6;p=fw%2Faltos diff --git a/altoslib/AltosTelemetryMegaSensor.java b/altoslib/AltosTelemetryMegaSensor.java index 471e1787..6acbb5bc 100644 --- a/altoslib/AltosTelemetryMegaSensor.java +++ b/altoslib/AltosTelemetryMegaSensor.java @@ -16,7 +16,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altoslib_13; +package org.altusmetrum.altoslib_14; public class AltosTelemetryMegaSensor extends AltosTelemetryStandard { int orient() { return int8(5); } @@ -105,20 +105,6 @@ public class AltosTelemetryMegaSensor extends AltosTelemetryStandard { return gyro_z(); } - public static int mag_across_axis(int imu_type) { - switch (imu_type) { - case AltosIMU.imu_type_telemega_v1_v2: - case AltosIMU.imu_type_telemega_v3: - case AltosIMU.imu_type_easymega_v1: - return AltosIMU.imu_axis_x; - case AltosIMU.imu_type_telemega_v4: - case AltosIMU.imu_type_easymega_v2: - return AltosIMU.imu_axis_y; - default: - return AltosLib.MISSING; - } - } - private int mag_across(int imu_type) { switch (imu_type) { case AltosIMU.imu_type_telemega_v1_v2: @@ -133,20 +119,6 @@ public class AltosTelemetryMegaSensor extends AltosTelemetryStandard { } } - public static int mag_along_axis(int imu_type) { - switch (imu_type) { - case AltosIMU.imu_type_telemega_v1_v2: - case AltosIMU.imu_type_telemega_v3: - case AltosIMU.imu_type_easymega_v1: - return AltosIMU.imu_axis_y; - case AltosIMU.imu_type_easymega_v2: - case AltosIMU.imu_type_telemega_v4: - return AltosIMU.imu_axis_x; - default: - return AltosLib.MISSING; - } - } - private int mag_along(int imu_type) { switch (imu_type) { case AltosIMU.imu_type_telemega_v1_v2: @@ -161,10 +133,6 @@ public class AltosTelemetryMegaSensor extends AltosTelemetryStandard { } } - public static int mag_through_axis(int imu_type) { - return AltosIMU.imu_axis_z; - } - private int mag_through(int imu_type) { return mag_z(); }