Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altoslib / AltosRecordMM.java

diff --git a/altoslib/AltosRecordMM.java b/altoslib/AltosRecordMM.java
index 63b37f82c2c953965e7610dff47d20f5e451dec2..546f305537ef162909883f427ae12629c7f8fa94 100644 (file)
--- a/altoslib/AltosRecordMM.java
+++ b/altoslib/AltosRecordMM.java
@@ -19,6 +19,7 @@ package org.altusmetrum.AltosLib;
 
 public class AltosRecordMM extends AltosRecord {
 
+       /* Sensor values */
        public int      accel;
        public int      pres;
        public int      temp;
@@ -45,16 +46,12 @@ public class AltosRecordMM extends AltosRecord {
                return raw / 4095.0;
        }
 
-       public double raw_pressure() {
+       public double pressure() {
                if (pres != MISSING)
                        return pres;
                return MISSING;
        }
 
-       public double filtered_pressure() {
-               return raw_pressure();
-       }
-
        public double ground_pressure() {
                if (ground_pres != MISSING)
                        return ground_pres;
@@ -98,9 +95,6 @@ public class AltosRecordMM extends AltosRecord {
        }
 
        public double acceleration() {
-               if (acceleration != MISSING)
-                       return acceleration;
-
                if (ground_accel == MISSING || accel == MISSING)
                        return MISSING;
 
@@ -110,14 +104,6 @@ public class AltosRecordMM extends AltosRecord {
                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 (AltosRecordMM old) {
                super.copy(old);
 
@@ -145,10 +131,10 @@ public class AltosRecordMM extends AltosRecord {
                mag = old.mag;
        }
 
+
+
        public AltosRecordMM clone() {
-               AltosRecordMM n = (AltosRecordMM) super.clone();
-               n.copy(this);
-               return n;
+               return new AltosRecordMM(this);
        }
 
        void make_missing() {
@@ -181,6 +167,10 @@ public class AltosRecordMM extends AltosRecord {
                make_missing();
        }
 
+       public AltosRecordMM(AltosRecordMM old) {
+               copy(old);
+       }
+
        public AltosRecordMM() {
                super();
                make_missing();