X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosRecordMM.java;h=bf64192c5888abe1a75e8050e72d2329db4fb154;hb=cef4e3ee95037050ae859fb2fdc0a57373764bd8;hp=5f952f7a96a1b8aa02543076de90638f3e8cb860;hpb=99b7eaf8d1b312443b842d078fb8464032b3a39b;p=fw%2Faltos

diff --git a/altoslib/AltosRecordMM.java b/altoslib/AltosRecordMM.java
index 5f952f7a..bf64192c 100644
--- a/altoslib/AltosRecordMM.java
+++ b/altoslib/AltosRecordMM.java
@@ -15,10 +15,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_1;
 
 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,10 +104,6 @@ public class AltosRecordMM extends AltosRecord {
 		return (ground_accel - accel) / accel_counts_per_mss();
 	}
 
-	public double accel_speed() {
-		return speed;
-	}
-
 	public void copy (AltosRecordMM old) {
 		super.copy(old);
 
@@ -141,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() {
@@ -177,6 +167,10 @@ public class AltosRecordMM extends AltosRecord {
 		make_missing();
 	}
 
+	public AltosRecordMM(AltosRecordMM old) {
+		copy(old);
+	}
+
 	public AltosRecordMM() {
 		super();
 		make_missing();