altoslib: Reset transient AltosCalData values before processing data

[fw/altos] / altoslib / AltosCalData.java

diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java
index 54b75817bb7196b2fc8b82cd88c5ca4d5ea0bcd1..cb58e4929c3056ada5af4db3b6249d53a9e16932 100644 (file)
--- 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) {
        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;
                        this.device_type = device_type;

+                       if (product == null)
+                               set_product(AltosLib.product_name(device_type));
+               }

        }
 
        public int              config_major = AltosLib.MISSING;
        }
 
        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) {
 
        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;
                }
                        accel_plus_g = plus;
                        accel_minus_g = minus;
                }


@@ -177,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() {
        public int              boost_tick = AltosLib.MISSING;
 
        public void set_boost_tick() {