altoslib: TeleMega telemetry pyro voltages are uint8

[fw/altos] / altoslib / AltosTelemetryMegaData.java

diff --git a/altoslib/AltosTelemetryMegaData.java b/altoslib/AltosTelemetryMegaData.java
index f5cc01d07a5d1913ebad9d7629e6fdde4fe0d43f..d949c02f3bc233fcc937e17150841f5184daf495 100644 (file)
--- a/altoslib/AltosTelemetryMegaData.java
+++ b/altoslib/AltosTelemetryMegaData.java
@@ -15,11 +15,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_5;
 
 public class AltosTelemetryMegaData extends AltosTelemetryStandard {
        int     state;
-       
+
        int     v_batt;
        int     v_pyro;
        int     sense[];
@@ -31,20 +31,20 @@ public class AltosTelemetryMegaData extends AltosTelemetryStandard {
 
        int     acceleration;
        int     speed;
-       int     height;
+       int     height_16;
 
        public AltosTelemetryMegaData(int[] bytes) {
                super(bytes);
 
-               state = int8(5);
+               state = uint8(5);
 
                v_batt = int16(6);
                v_pyro = int16(8);
 
-               sense = new int[6];     
+               sense = new int[6];
 
                for (int i = 0; i < 6; i++) {
-                       sense[i] = int8(10 + i) << 4;
+                       sense[i] = uint8(10 + i) << 4;
                        sense[i] |= sense[i] >> 8;
                }
 
@@ -55,14 +55,15 @@ public class AltosTelemetryMegaData extends AltosTelemetryStandard {
 
                acceleration = int16(26);
                speed = int16(28);
-               height = int16(30);
+
+               height_16 = int16(30);
        }
 
        public void update_state(AltosState state) {
                super.update_state(state);
 
                state.set_state(this.state);
-                       
+
                state.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt));
                state.set_pyro_voltage(AltosConvert.mega_pyro_voltage(v_pyro));
 
@@ -79,7 +80,13 @@ public class AltosTelemetryMegaData extends AltosTelemetryStandard {
                state.set_ground_pressure(ground_pres);
                state.set_accel_g(accel_plus_g, accel_minus_g);
 
-               state.set_kalman(height, speed/16.0, acceleration / 16.0);
+               /* Fill in the high bits of height from recent GPS
+                * data if available, otherwise guess using the
+                * previous kalman height
+                */
+
+               state.set_kalman(extend_height(state, height_16),
+                                speed/16.0, acceleration / 16.0);
        }
 }