From 78b4bf77fca96bef2cce443ad4c9544ae83f0acc Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 28 May 2017 15:52:17 -0700 Subject: altoslib: Reset transient AltosCalData values before processing data Values in cal_data which are used to hold intermediate results need to get reset back to their initial values before processing a series of flight data again. Signed-off-by: Keith Packard --- altoslib/AltosCalData.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'altoslib/AltosCalData.java') diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java index 408d8d7e..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; @@ -179,6 +182,18 @@ public class AltosCalData { } } + /* 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() { -- cgit v1.2.3