altoslib: Move computed state from AltosRecord to AltosState

[fw/altos] / altosui / AltosGraphUI.java

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index cb8e3d2072595d0ef0dcd6f8659fc7e7abb058e3..f59f70bab47781daf0783e747875e2ec45542152 100644 (file)
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -40,12 +40,7 @@ public class AltosGraphUI extends AltosFrame
         AltosGraphTime.Element speed =
                new AltosGraphTime.TimeSeries(String.format("Speed (%s)", AltosConvert.speed.show_units()), "Vertical Speed", green) { 
                 public void gotTimeData(double time, AltosDataPoint d) {
-                   double      speed;
-                   if (d.state() < Altos.ao_flight_drogue && d.has_accel()) {
-                       speed = d.accel_speed();
-                    } else {
-                       speed = d.baro_speed();
-                    }
+                   double      speed = d.speed();
                    if (speed != AltosRecord.MISSING)
                            series.add(time, AltosConvert.speed.value(speed));
                 }