altosdroid: convert rogue files to unix line endings

[fw/altos] / altoslib / AltosTelemetryRecordSensor.java

diff --git a/altoslib/AltosTelemetryRecordSensor.java b/altoslib/AltosTelemetryRecordSensor.java
index 319a91b39d78df1195a9f64860973170bb3d79ee..d1d9dd7ec8e78f257c0fd6ed8172e1b78183628d 100644 (file)
--- a/altoslib/AltosTelemetryRecordSensor.java
+++ b/altoslib/AltosTelemetryRecordSensor.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 AltosTelemetryRecordSensor extends AltosTelemetryRecordRaw {
@@ -36,10 +36,8 @@ public class AltosTelemetryRecordSensor extends AltosTelemetryRecordRaw {
        int     accel_plus_g;
        int     accel_minus_g;
 
-       int     rssi;
-
-       public AltosTelemetryRecordSensor(int[] in_bytes, int in_rssi) {
-               super(in_bytes);
+       public AltosTelemetryRecordSensor(int[] in_bytes, int rssi) {
+               super(in_bytes, rssi);
                state         = uint8(5);
 
                accel         = int16(6);
@@ -57,8 +55,6 @@ public class AltosTelemetryRecordSensor extends AltosTelemetryRecordRaw {
                ground_accel  = int16(26);
                accel_plus_g  = int16(28);
                accel_minus_g = int16(30);
-
-               rssi          = in_rssi;
        }
 
        public AltosRecord update_state(AltosRecord prev) {
@@ -74,7 +70,7 @@ public class AltosTelemetryRecordSensor extends AltosTelemetryRecordRaw {
                if (type == packet_type_TM_sensor)
                        next.accel = accel;
                else
-                       next.accel = AltosRecord.MISSING;
+                       next.accel = AltosLib.MISSING;
                next.pres = pres;
                next.temp = temp;
                next.batt = v_batt;
@@ -82,13 +78,13 @@ public class AltosTelemetryRecordSensor extends AltosTelemetryRecordRaw {
                        next.drogue = sense_d;
                        next.main = sense_m;
                } else {
-                       next.drogue = AltosRecord.MISSING;
-                       next.main = AltosRecord.MISSING;
+                       next.drogue = AltosLib.MISSING;
+                       next.main = AltosLib.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) {
@@ -96,13 +92,11 @@ public class AltosTelemetryRecordSensor extends AltosTelemetryRecordRaw {
                        next.accel_plus_g = accel_plus_g;
                        next.accel_minus_g = accel_minus_g;
                } else {
-                       next.ground_accel = AltosRecord.MISSING;
-                       next.accel_plus_g = AltosRecord.MISSING;
-                       next.accel_minus_g = AltosRecord.MISSING;
+                       next.ground_accel = AltosLib.MISSING;
+                       next.accel_plus_g = AltosLib.MISSING;
+                       next.accel_minus_g = AltosLib.MISSING;
                }
 
-               next.rssi = rssi;
-
                next.seen |= AltosRecord.seen_sensor | AltosRecord.seen_temp_volt;
 
                return next;