altoslib,altosuilib: Remove stale source files

[fw/altos] / altoslib / AltosCalData.java

diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java
index 408d8d7e5f78738e7298fda27c06543f9cdef4a1..2eff6ac1188610753c5b38c212183fbf2f0ac405 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) {
-               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;
@@ -165,6 +168,7 @@ public class AltosCalData {
        }
 
        public int              tick = AltosLib.MISSING;
+       private int             first_tick = AltosLib.MISSING;
        private int             prev_tick = AltosLib.MISSING;
 
        public void set_tick(int tick) {
@@ -174,11 +178,25 @@ public class AltosCalData {
                                        tick += 65536;
                                }
                        }
+                       if (first_tick == AltosLib.MISSING)
+                               first_tick = tick;
                        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() {
@@ -194,9 +212,11 @@ public class AltosCalData {
        public double time() {
                if (tick == AltosLib.MISSING)
                        return AltosLib.MISSING;
-               if (boost_tick == AltosLib.MISSING)
-                       return AltosLib.MISSING;
-               return (tick - boost_tick) / ticks_per_sec;
+               if (boost_tick != AltosLib.MISSING)
+                       return (tick - boost_tick) / ticks_per_sec;
+               if (first_tick != AltosLib.MISSING)
+                       return (tick - first_tick) / ticks_per_sec;
+               return tick / ticks_per_sec;
        }
 
        public double boost_time() {