diff options
| author | Bdale Garbee <bdale@gag.com> | 2015-02-07 22:39:54 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2015-02-07 22:39:54 -0700 |
| commit | f766a457323268857b3f2dfc7f42427437b71cb7 (patch) | |
| tree | 8afc8a661d682fc34b16fc0b1b44f2844d34f336 /altoslib/AltosFlightStats.java | |
| parent | db51224af01731e7323f6f696a7397d64eb80b92 (diff) | |
| parent | e2cefd8593d269ce603aaf33f4a53a5c2dcb3350 (diff) | |
Merge branch 'branch-1.6' into debian
Conflicts:
ChangeLog
altoslib/AltosTelemetryReader.java
configure.ac
Diffstat (limited to 'altoslib/AltosFlightStats.java')
| -rw-r--r-- | altoslib/AltosFlightStats.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/altoslib/AltosFlightStats.java b/altoslib/AltosFlightStats.java index 1b88cb9f..82e477f8 100644 --- a/altoslib/AltosFlightStats.java +++ b/altoslib/AltosFlightStats.java @@ -15,7 +15,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altoslib_5; +package org.altusmetrum.altoslib_6; import java.io.*; @@ -37,6 +37,8 @@ public class AltosFlightStats { public double pad_lat, pad_lon; public boolean has_flight_data; public boolean has_gps; + public boolean has_gps_sats; + public boolean has_gps_detail; public boolean has_flight_adc; public boolean has_battery; public boolean has_rssi; @@ -113,6 +115,7 @@ public class AltosFlightStats { lat = lon = AltosLib.MISSING; has_flight_data = false; has_gps = false; + has_gps_sats = false; has_flight_adc = false; has_battery = false; has_rssi = false; @@ -174,6 +177,10 @@ public class AltosFlightStats { lat = state.gps.lat; lon = state.gps.lon; has_gps = true; + if (state.gps.cc_gps_sat != null) + has_gps_sats = true; + if (state.gps.course != AltosLib.MISSING) + has_gps_detail = true; } if (state.imu != null) has_imu = true; |