Merge remote-tracking branch 'origin/micropeak-logging'

[fw/altos] / altoslib / AltosRecordTM.java

diff --git a/altoslib/AltosRecordTM.java b/altoslib/AltosRecordTM.java
index 37accef60289cd8d2518d4217c5d9b22403cae26..f6ed496690c127b521b70ee16420604bce09c708 100644 (file)
--- a/altoslib/AltosRecordTM.java
+++ b/altoslib/AltosRecordTM.java
@@ -18,6 +18,8 @@
 package org.altusmetrum.AltosLib;
 
 public class AltosRecordTM extends AltosRecord {
+
+       /* Sensor values */
        public int      accel;
        public int      pres;
        public int      temp;
@@ -57,18 +59,12 @@ public class AltosRecordTM extends AltosRecord {
                return ((count / 16.0) / 2047.0 + 0.095) / 0.009 * 1000.0;
        }
 
-       public double raw_pressure() {
+       public double pressure() {
                if (pres == MISSING)
                        return MISSING;
                return barometer_to_pressure(pres);
        }
 
-       public double filtered_pressure() {
-               if (flight_pres == MISSING)
-                       return MISSING;
-               return barometer_to_pressure(flight_pres);
-       }
-
        public double ground_pressure() {
                if (ground_pres == MISSING)
                        return MISSING;
@@ -121,22 +117,11 @@ public class AltosRecordTM extends AltosRecord {
        }
 
        public double acceleration() {
-               if (acceleration != MISSING)
-                       return acceleration;
-
                if (ground_accel == MISSING || accel == MISSING)
                        return MISSING;
                return (ground_accel - accel) / accel_counts_per_mss();
        }
 
-       public double accel_speed() {
-               if (speed != MISSING)
-                       return speed;
-               if (flight_vel == MISSING)
-                       return MISSING;
-               return flight_vel / (accel_counts_per_mss() * 100.0);
-       }
-
        public void copy(AltosRecordTM old) {
                super.copy(old);
 
@@ -164,9 +149,7 @@ public class AltosRecordTM extends AltosRecord {
        }
 
        public AltosRecordTM clone() {
-               AltosRecordTM   n = (AltosRecordTM) super.clone();
-               n.copy(this);
-               return n;
+               return new AltosRecordTM(this);
        }
 
        void make_missing() {
@@ -192,6 +175,10 @@ public class AltosRecordTM extends AltosRecord {
                make_missing();
        }
 
+       public AltosRecordTM(AltosRecordTM old) {
+               copy(old);
+       }
+       
        public AltosRecordTM() {
                super();
                make_missing();