X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosState.java;h=2e4d8870e12684d5f6aa3ef6764f1338492f9281;hb=08345b8909922f2ff8f9ed8b4497b9cbea6b26e9;hp=e20ec9a7109dbcd493deac0b544f692f2e78cd38;hpb=e2b472bbb2418fc13be42dbc7c52beb88479c46d;p=fw%2Faltos diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java index e20ec9a7..2e4d8870 100644 --- a/altoslib/AltosState.java +++ b/altoslib/AltosState.java @@ -38,6 +38,7 @@ public class AltosState { public boolean boost; /* under power */ public double ground_altitude; + public double altitude; public double height; public double speed; public double acceleration; @@ -76,12 +77,13 @@ public class AltosState { public double speak_altitude; public void init (AltosRecord cur, AltosState prev_state) { - int i; - AltosRecord prev; + //int i; + //AltosRecord prev; data = cur; ground_altitude = data.ground_altitude(); + altitude = data.raw_altitude(); height = data.filtered_height(); report_time = System.currentTimeMillis(); @@ -163,6 +165,8 @@ public class AltosState { } else pad_alt = ground_altitude; + data.new_gps = false; + gps_waiting = MIN_PAD_SAMPLES - npad; if (gps_waiting < 0) gps_waiting = 0;