AltosTelemetryReader: actually open serial port

[fw/altos] / ao-tools / altosui / AltosRecord.java

diff --git a/ao-tools/altosui/AltosRecord.java b/ao-tools/altosui/AltosRecord.java
index 3440d935348f074efec3a5d9b53de8557e4b0319..004847678b71feff904b0295aff4cfb0338b14b2 100644 (file)
--- a/ao-tools/altosui/AltosRecord.java
+++ b/ao-tools/altosui/AltosRecord.java
@@ -48,6 +48,8 @@ public class AltosRecord {
        int     accel_minus_g;
        AltosGPS        gps;
 
+       double  time;   /* seconds since boost */
+
        /*
         * Values for our MP3H6115A pressure sensor
         *
@@ -71,7 +73,11 @@ public class AltosRecord {
                return ((count / 16.0) / 2047.0 + 0.095) / 0.009 * 1000.0;
        }
 
-       public double pressure() {
+       public double raw_pressure() {
+               return barometer_to_pressure(pres);
+       }
+
+       public double filtered_pressure() {
                return barometer_to_pressure(flight_pres);
        }
 
@@ -79,16 +85,24 @@ public class AltosRecord {
                return barometer_to_pressure(ground_pres);
        }
 
-       public double altitude() {
-               return AltosConvert.pressure_to_altitude(pressure());
+       public double filtered_altitude() {
+               return AltosConvert.pressure_to_altitude(filtered_pressure());
+       }
+
+       public double raw_altitude() {
+               return AltosConvert.pressure_to_altitude(raw_pressure());
        }
 
        public double ground_altitude() {
                return AltosConvert.pressure_to_altitude(ground_pressure());
        }
 
-       public double height() {
-               return altitude() - ground_altitude();
+       public double filtered_height() {
+               return filtered_altitude() - ground_altitude();
+       }
+
+       public double raw_height() {
+               return raw_altitude() - ground_altitude();
        }
 
        public double battery_voltage() {
@@ -128,7 +142,7 @@ public class AltosRecord {
                return counts_per_g / 9.80665;
        }
        public double acceleration() {
-               return (accel_plus_g - accel) / accel_counts_per_mss();
+               return (ground_accel - accel) / accel_counts_per_mss();
        }
 
        public double accel_speed() {