altoslib: Move computed state from AltosRecord to AltosState

Make AltosRecord simply track the raw data and have AltosState hold
all computed values, including cross-packet averages and computed speeds.

Signed-off-by: Keith Packard <keithp@keithp.com>

1 files changed, 2 insertions, 16 deletions

diff --git a/altoslib/AltosRecordMM.java b/altoslib/AltosRecordMM.java
index 63b37f82..9f529234 100644
--- 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);