ao-tools: Add TMv2 and Tgps log formats to cc.h

[fw/altos] / altoslib / AltosTelemetryMetrumSensor.java

diff --git a/altoslib/AltosTelemetryMetrumSensor.java b/altoslib/AltosTelemetryMetrumSensor.java
index 59d34dbafb13e2080b1ee01f7b8b37b79be583f6..beab6da99f18e9a3180b321e735be57f1c7d2620 100644 (file)
--- a/altoslib/AltosTelemetryMetrumSensor.java
+++ b/altoslib/AltosTelemetryMetrumSensor.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_5;
 
 
 public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
@@ -27,7 +27,7 @@ public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
 
        int     acceleration;
        int     speed;
-       int     height;
+       int     height_16;
 
        int     v_batt;
        int     sense_a;
@@ -43,7 +43,7 @@ public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
 
                acceleration  = int16(14);
                speed         = int16(16);
-               height        = int16(18);
+               height_16     = int16(18);
 
                v_batt        = int16(20);
                sense_a       = int16(22);
@@ -56,14 +56,15 @@ public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
                state.set_state(this.state);
 
                state.set_accel(accel);
-               state.set_ms5607(pres, temp);
+               state.set_pressure(pres);
+               state.set_temperature(temp/100.0);
 
-               state.set_kalman(height, speed/16.0, acceleration/16.0);
+               state.set_kalman(extend_height(state, height_16),
+                                speed/16.0, acceleration/16.0);
 
                state.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt));
 
                state.set_apogee_voltage(AltosConvert.mega_pyro_voltage(sense_a));
                state.set_main_voltage(AltosConvert.mega_pyro_voltage(sense_m));
-               System.out.printf ("sense_a %d apogee voltage %g\n", sense_a, state.apogee_voltage);
        }
 }