X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosState.java;h=9ee3d57ddf814fe340ef53df61fa2e31758d5cae;hb=master;hp=eea7a9c6760c1bfd4acd7cd86aa0c63c334c66f7;hpb=305e7852f764e6a06024a9d57b5766d2f8a056ee;p=fw%2Faltos

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index eea7a9c6..28fdbb24 100644
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -20,7 +20,7 @@
  * Track flight state from telemetry or eeprom data stream
  */
 
-package org.altusmetrum.altoslib_13;
+package org.altusmetrum.altoslib_14;
 
 public class AltosState extends AltosDataListener {
 
@@ -307,13 +307,12 @@ public class AltosState extends AltosDataListener {
 	class AltosGpsGroundAltitude extends AltosValue {
 		void set(double a, double t) {
 			super.set(a, t);
-			pad_alt = value();
+
 			gps_altitude.set_gps_height();
 		}
 
 		void set_filtered(double a, double t) {
 			super.set_filtered(a, t);
-			pad_alt = value();
 			gps_altitude.set_gps_height();
 		}
 
@@ -693,7 +692,7 @@ public class AltosState extends AltosDataListener {
 
 	public double	gps_height;
 
-	public double pad_lat, pad_lon, pad_alt;
+	public double pad_lat, pad_lon;
 
 	public int	speak_tick;
 	public double	speak_altitude;
@@ -704,6 +703,8 @@ public class AltosState extends AltosDataListener {
 
 	public int	pyro_fired;
 
+	public double	motor_pressure;
+
 	public void set_npad(int npad) {
 		this.npad = npad;
 		gps_waiting = MIN_PAD_SAMPLES - npad;
@@ -775,7 +776,6 @@ public class AltosState extends AltosDataListener {
 
 		pad_lat = AltosLib.MISSING;
 		pad_lon = AltosLib.MISSING;
-		pad_alt = AltosLib.MISSING;
 
 		gps_altitude = new AltosGpsAltitude();
 		gps_ground_altitude = new AltosGpsGroundAltitude();
@@ -1049,6 +1049,10 @@ public class AltosState extends AltosDataListener {
 		this.pyro_fired = fired;
 	}
 
+	public void set_motor_pressure(double motor_pressure) {
+		this.motor_pressure = motor_pressure;
+	}
+
 	public AltosState() {
 		init();
 	}