From: Keith Packard Date: Mon, 15 May 2017 19:13:35 +0000 (-0700) Subject: altoslib: Set default accel cal for old TeleMetrum v1 files X-Git-Tag: 1.8~110 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=65fd7b23b1a8861afd74e4e42ce1918c059fbff1 altoslib: Set default accel cal for old TeleMetrum v1 files Before we stashed the config data in the log file, altoslib had to "known" what the accelerometer calibration values should be set to. Signed-off-by: Keith Packard --- diff --git a/altoslib/AltosEepromRecordFull.java b/altoslib/AltosEepromRecordFull.java index 4b1a460f..fbb8fbd9 100644 --- a/altoslib/AltosEepromRecordFull.java +++ b/altoslib/AltosEepromRecordFull.java @@ -19,6 +19,8 @@ public class AltosEepromRecordFull extends AltosEepromRecord { public static final int max_sat = 12; + public static final int two_g_default = 16294 - 15758; + public void update_state(AltosState state) { super.update_state(state); AltosGPS gps; @@ -43,6 +45,8 @@ public class AltosEepromRecordFull extends AltosEepromRecord { state.set_state(AltosLib.ao_flight_pad); state.set_ground_accel(data16(0)); state.set_flight(data16(2)); + if (state.accel_plus_g == AltosLib.MISSING) + state.set_accel_g(data16(0), data16(0) + two_g_default); break; case AltosLib.AO_LOG_SENSOR: state.set_accel(data16(0));