diff options
| author | Keith Packard <keithp@keithp.com> | 2012-10-21 16:13:14 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-10-21 16:13:14 -0700 |
| commit | 7894c27b2b2c3c46a7c107c8acd5977830f006cf (patch) | |
| tree | f05c9d5c6bc06c1764118d1f5596a95f0016178d /altosui/AltosGraphUI.java | |
| parent | dec2e455935a71dec13b84bb886252b7f4a1a641 (diff) | |
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>
Diffstat (limited to 'altosui/AltosGraphUI.java')
| -rw-r--r-- | altosui/AltosGraphUI.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java index cb8e3d20..f59f70ba 100644 --- 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)); } |