diff options
| author | Keith Packard <keithp@keithp.com> | 2017-05-25 22:36:05 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2017-05-25 22:37:22 -0700 |
| commit | 222158581887b5f9e8b9843d14321c313fa023fa (patch) | |
| tree | 4baab1916948932f9c5eff5960d685b58d62f470 /altoslib/AltosCalData.java | |
| parent | 4d497c1be534e2b206edec3c096198c8ea64cebe (diff) | |
altoslib/altosuilib/altosui: More work towards using AltosFlightSeries for analysis
Graphing and CSV seem complete now; stats still missing lots of stuff.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosCalData.java')
| -rw-r--r-- | altoslib/AltosCalData.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java index 58d34abe..3da0e400 100644 --- a/altoslib/AltosCalData.java +++ b/altoslib/AltosCalData.java @@ -204,12 +204,11 @@ public class AltosCalData { this.state = state; } - public double gps_ground_altitude = AltosLib.MISSING; + public AltosGPS gps_pad = null; - public void set_gps_altitude(double altitude) { - if ((state != AltosLib.MISSING && state < AltosLib.ao_flight_boost) || - gps_ground_altitude == AltosLib.MISSING) - gps_ground_altitude = altitude; + public void set_gps(AltosGPS gps) { + if ((state != AltosLib.MISSING && state < AltosLib.ao_flight_boost) || gps_pad == null) + gps_pad = gps; } /* @@ -226,7 +225,7 @@ public class AltosCalData { public void reset_temp_gps() { if (temp_gps != null) { if (temp_gps.locked && temp_gps.nsat >= 4) - set_gps_altitude(temp_gps.alt); + set_gps(temp_gps); } temp_gps = null; } |