summaryrefslogtreecommitdiff
path: root/altoslib/AltosTelemetryRecordSensor.java
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2012-10-23 09:38:36 -0600
committerBdale Garbee <bdale@gag.com>2012-10-23 09:38:36 -0600
commit055f3232decc07e064d596469b81cf9869411c2d (patch)
treecc5ebf8283ca00cbe1344f6ed808feaf7e9575ad /altoslib/AltosTelemetryRecordSensor.java
parent8ca58e20208495ce63b8256a8ffa43932867e8d5 (diff)
parent9e60fa214ad2c48fbe8f7e5c437681aa35d249fa (diff)
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'altoslib/AltosTelemetryRecordSensor.java')
-rw-r--r--altoslib/AltosTelemetryRecordSensor.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/altoslib/AltosTelemetryRecordSensor.java b/altoslib/AltosTelemetryRecordSensor.java
index 319a91b3..f1fc156c 100644
--- a/altoslib/AltosTelemetryRecordSensor.java
+++ b/altoslib/AltosTelemetryRecordSensor.java
@@ -86,9 +86,9 @@ public class AltosTelemetryRecordSensor extends AltosTelemetryRecordRaw {
next.main = AltosRecord.MISSING;
}
- 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.ground_pres = ground_pres;
if (type == packet_type_TM_sensor) {