X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryMetrumSensor.java;h=e15043b4add4862724d6d7a8b184c5625864046b;hb=6804ead7f7e54ff34b257e10e381dc52d5a61b06;hp=59d34dbafb13e2080b1ee01f7b8b37b79be583f6;hpb=77dc89ed5b7bf8f5b3fa3b6131660f1a98f583ea;p=fw%2Faltos

diff --git a/altoslib/AltosTelemetryMetrumSensor.java b/altoslib/AltosTelemetryMetrumSensor.java
index 59d34dba..e15043b4 100644
--- a/altoslib/AltosTelemetryMetrumSensor.java
+++ b/altoslib/AltosTelemetryMetrumSensor.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_11;
 
 
 public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
@@ -27,7 +28,7 @@ public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
 
 	int	acceleration;
 	int	speed;
-	int	height;
+	int	height_16;
 
 	int	v_batt;
 	int	sense_a;
@@ -43,7 +44,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 +57,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);
 	}
 }