X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryMetrumSensor.java;h=6d4cbea0300a033aded898cea50b151853eed3a9;hb=7975d088a4ac44c0943134fa41d0e3b88f50b98f;hp=232468bbf67ca5967d42f4d4f8996f1ffee09b5c;hpb=b89fb51a963635e2effe3a31f803bfc29c2c46b7;p=fw%2Faltos

diff --git a/altoslib/AltosTelemetryMetrumSensor.java b/altoslib/AltosTelemetryMetrumSensor.java
index 232468bb..6d4cbea0 100644
--- 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_3;
+package org.altusmetrum.altoslib_7;
 
 
 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);
@@ -59,7 +59,8 @@ public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
 		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));