X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosState.java;h=5fce15c43865e63b43447db93f59faf725f838f7;hb=HEAD;hp=e3ea0524e90b8bd3d873aeb50d7ba722e6a80340;hpb=52149fd81df45f37f5097850795f290f463c43ef;p=fw%2Faltos diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java index e3ea0524..28fdbb24 100644 --- a/altoslib/AltosState.java +++ b/altoslib/AltosState.java @@ -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(); }