X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosEepromRecordMega.java;h=b858e7098d7f8907938fd8da40c3ccc7e04bc827;hb=eb77758b7dcdd0bcef12cd1d56cf4d447cbe5c8c;hp=168b352c652a8a67707a45bb5bb6c516568ea7c4;hpb=a4039a60bbe972fd022699d62ab06a8f1bc4af69;p=fw%2Faltos diff --git a/altoslib/AltosEepromRecordMega.java b/altoslib/AltosEepromRecordMega.java index 168b352c..b858e709 100644 --- a/altoslib/AltosEepromRecordMega.java +++ b/altoslib/AltosEepromRecordMega.java @@ -12,7 +12,7 @@ * General Public License for more details. */ -package org.altusmetrum.altoslib_13; +package org.altusmetrum.altoslib_14; public class AltosEepromRecordMega extends AltosEepromRecord { public static final int record_length = 32; @@ -287,16 +287,7 @@ public class AltosEepromRecordMega extends AltosEepromRecord { cal_data.mag_across(mag_across), cal_data.mag_through(mag_through)); - - final double lsb_per_g = 1920.0/105.5; - - double acceleration = AltosConvert.acceleration_from_sensor( - accel(), - cal_data.ground_accel, - cal_data.ground_accel + 2 * lsb_per_g, - cal_data.ground_accel); - - listener.set_acceleration(acceleration); + listener.set_acceleration(cal_data.acceleration(accel())); break; case AltosLib.AO_LOG_TEMP_VOLT: listener.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt()));