altoslib: Move computed state from AltosRecord to AltosState

[fw/altos] / altoslib / AltosTelemetryRecordMegaData.java

diff --git a/altoslib/AltosTelemetryRecordMegaData.java b/altoslib/AltosTelemetryRecordMegaData.java
index cc35cd834c535947e773763c96ff9b3255cc3ef4..16a7b80cc0f037a12e1cfc62c3f18c2a8982820a 100644 (file)
--- a/altoslib/AltosTelemetryRecordMegaData.java
+++ b/altoslib/AltosTelemetryRecordMegaData.java
@@ -65,10 +65,8 @@ public class AltosTelemetryRecordMegaData extends AltosTelemetryRecordRaw {
 
                AltosRecordMM   next;
                if (!(n instanceof AltosRecordMM)) {
-                       System.out.printf("data making record MM\n");
                        next = new AltosRecordMM(n);
                } else {
-                       System.out.printf ("data already has MM\n");
                        next = (AltosRecordMM) n;
                }
 
@@ -85,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;