altoslib: Finish AltosState changes. Update version number.

[fw/altos] / altoslib / AltosTelemetryRecordMegaSensor.java

diff --git a/altoslib/AltosTelemetryRecordMegaSensor.java b/altoslib/AltosTelemetryRecordMegaSensor.java
index 85a32d12c8d4283125b54597d8b9dd1f9e725e76..234cda27ba36f44a6b90e35bfeb0cfbb9bafdf3b 100644 (file)
--- a/altoslib/AltosTelemetryRecordMegaSensor.java
+++ b/altoslib/AltosTelemetryRecordMegaSensor.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 AltosTelemetryRecordMegaSensor extends AltosTelemetryRecordRaw {
@@ -35,10 +35,8 @@ public class AltosTelemetryRecordMegaSensor extends AltosTelemetryRecordRaw {
        int     mag_y;
        int     mag_z;
 
-       int     rssi;
-
-       public AltosTelemetryRecordMegaSensor(int[] in_bytes, int in_rssi) {
-               super(in_bytes);
+       public AltosTelemetryRecordMegaSensor(int[] in_bytes, int rssi) {
+               super(in_bytes, rssi);
 
                accel         = int16(6);
                pres          = int32(8);
@@ -55,9 +53,6 @@ public class AltosTelemetryRecordMegaSensor extends AltosTelemetryRecordRaw {
                mag_x         = int16(26);
                mag_y         = int16(28);
                mag_z         = int16(30);
-
-               rssi          = in_rssi;
-               System.out.printf ("telem record accel: %d\n", accel);
        }
 
        public AltosRecord update_state(AltosRecord previous) {
@@ -65,14 +60,11 @@ public class AltosTelemetryRecordMegaSensor extends AltosTelemetryRecordRaw {
 
                AltosRecordMM   next;
                if (!(n instanceof AltosRecordMM)) {
-                       System.out.printf("sensor making MM\n");
                        next = new AltosRecordMM(n);
                } else {
-                       System.out.printf("sensor has MM\n");
                        next = (AltosRecordMM) n;
                }
 
-               System.out.printf("telem update_state accel: %d\n", accel);
                next.accel = accel;
                next.pres = pres;
                next.temp = temp;
@@ -89,8 +81,6 @@ public class AltosTelemetryRecordMegaSensor extends AltosTelemetryRecordRaw {
                next.mag.y = mag_y;
                next.mag.z = mag_z;
 
-               next.rssi = rssi;
-
                next.seen |= AltosRecord.seen_sensor;
 
                return next;