altoslib: Finish AltosState changes. Update version number.

[fw/altos] / altoslib / AltosTelemetryRecordMegaData.java

diff --git a/altoslib/AltosTelemetryRecordMegaData.java b/altoslib/AltosTelemetryRecordMegaData.java
index cc35cd834c535947e773763c96ff9b3255cc3ef4..ee9442d27a8e5ad458270591825f00d8b59a9c9b 100644 (file)
--- a/altoslib/AltosTelemetryRecordMegaData.java
+++ b/altoslib/AltosTelemetryRecordMegaData.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_2;
 
 
 public class AltosTelemetryRecordMegaData extends AltosTelemetryRecordRaw {
@@ -35,8 +35,8 @@ public class AltosTelemetryRecordMegaData extends AltosTelemetryRecordRaw {
        int     speed;
        int     height;
 
-       public AltosTelemetryRecordMegaData(int[] in_bytes) {
-               super(in_bytes);
+       public AltosTelemetryRecordMegaData(int[] in_bytes, int rssi) {
+               super(in_bytes, rssi);
 
                state = int8(5);
 
@@ -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,11 +83,11 @@ 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;
+               next.seen |= AltosRecord.seen_sensor | AltosRecord.seen_temp_volt;
 
                return next;
        }