summaryrefslogtreecommitdiff
path: root/altoslib/AltosTelemetryRecordMegaData.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-10-21 16:13:14 -0700
committerKeith Packard <keithp@keithp.com>2012-10-21 16:13:14 -0700
commit7894c27b2b2c3c46a7c107c8acd5977830f006cf (patch)
treef05c9d5c6bc06c1764118d1f5596a95f0016178d /altoslib/AltosTelemetryRecordMegaData.java
parentdec2e455935a71dec13b84bb886252b7f4a1a641 (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 'altoslib/AltosTelemetryRecordMegaData.java')
-rw-r--r--altoslib/AltosTelemetryRecordMegaData.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/altoslib/AltosTelemetryRecordMegaData.java b/altoslib/AltosTelemetryRecordMegaData.java
index 8f55d238..16a7b80c 100644
--- a/altoslib/AltosTelemetryRecordMegaData.java
+++ b/altoslib/AltosTelemetryRecordMegaData.java
@@ -83,9 +83,9 @@ public class AltosTelemetryRecordMegaData extends AltosTelemetryRecordRaw {
next.accel_plus_g = accel_plus_g;
next.accel_minus_g = accel_minus_g;
- next.acceleration = acceleration / 16.0;
- next.speed = speed / 16.0;
- next.height = height;
+ next.kalman_acceleration = acceleration / 16.0;
+ next.kalman_speed = speed / 16.0;
+ next.kalman_height = height;
next.seen |= AltosRecord.seen_flight | AltosRecord.seen_temp_volt;