projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into branch-1.6
[fw/altos]
/
altoslib
/
AltosFlightStats.java
diff --git
a/altoslib/AltosFlightStats.java
b/altoslib/AltosFlightStats.java
index 1b88cb9fc7e56e7b8b2abf7ae308571837c862ad..b837ba841bca3f2035dbb2362ae9117f949872cc 100644
(file)
--- a/
altoslib/AltosFlightStats.java
+++ b/
altoslib/AltosFlightStats.java
@@
-15,7
+15,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
5
;
+package org.altusmetrum.altoslib_
8
;
import java.io.*;
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 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;
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;
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;
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;
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;
}
if (state.imu != null)
has_imu = true;