X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosCalData.java;h=cb58e4929c3056ada5af4db3b6249d53a9e16932;hp=960de30a45f5aeb1f3f89462c3697616559c43bc;hb=78b4bf77fca96bef2cce443ad4c9544ae83f0acc;hpb=9e1295ff74d03f940fc68e6795bf30687162a440 diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java index 960de30a..cb58e492 100644 --- a/altoslib/AltosCalData.java +++ b/altoslib/AltosCalData.java @@ -65,8 +65,11 @@ public class AltosCalData { public int device_type = AltosLib.MISSING; public void set_device_type(int device_type) { - if (device_type != AltosLib.MISSING) + if (device_type != AltosLib.MISSING) { this.device_type = device_type; + if (product == null) + set_product(AltosLib.product_name(device_type)); + } } public int config_major = AltosLib.MISSING; @@ -98,6 +101,8 @@ public class AltosCalData { public void set_accel_plus_minus(double plus, double minus) { if (plus != AltosLib.MISSING && minus != AltosLib.MISSING) { + if (plus == minus) + return; accel_plus_g = plus; accel_minus_g = minus; } @@ -172,10 +177,23 @@ public class AltosCalData { tick += 65536; } } + prev_tick = tick; this.tick = tick; } } + /* Reset all values which change during flight + */ + public void reset() { + state = AltosLib.MISSING; + tick = AltosLib.MISSING; + prev_tick = AltosLib.MISSING; + temp_gps = null; + prev_gps = null; + temp_gps_sat_tick = AltosLib.MISSING; + accel = AltosLib.MISSING; + } + public int boost_tick = AltosLib.MISSING; public void set_boost_tick() {