projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore 32 and 64 bit cjnitest apps
[fw/altos]
/
altosui
/
AltosFlightStats.java
diff --git
a/altosui/AltosFlightStats.java
b/altosui/AltosFlightStats.java
index 552210c36adac61f13cc1c4c617903a208b9d8ba..bf5644c39888a26940df8fbb866836fe5ad32968 100644
(file)
--- a/
altosui/AltosFlightStats.java
+++ b/
altosui/AltosFlightStats.java
@@
-18,7
+18,7
@@
package altosui;
import java.io.*;
package altosui;
import java.io.*;
-import org.altusmetrum.altoslib_
2
.*;
+import org.altusmetrum.altoslib_
3
.*;
public class AltosFlightStats {
double max_height;
public class AltosFlightStats {
double max_height;
@@
-38,6
+38,9
@@
public class AltosFlightStats {
boolean has_gps;
boolean has_other_adc;
boolean has_rssi;
boolean has_gps;
boolean has_other_adc;
boolean has_rssi;
+ boolean has_imu;
+ boolean has_mag;
+ boolean has_orient;
double landed_time(AltosStateIterable states) {
AltosState state = null;
double landed_time(AltosStateIterable states) {
AltosState state = null;
@@
-108,6
+111,9
@@
public class AltosFlightStats {
has_gps = false;
has_other_adc = false;
has_rssi = false;
has_gps = false;
has_other_adc = false;
has_rssi = false;
+ has_imu = false;
+ has_mag = false;
+ has_orient = false;
for (AltosState state : states) {
if (serial == AltosLib.MISSING && state.serial != AltosLib.MISSING)
serial = state.serial;
for (AltosState state : states) {
if (serial == AltosLib.MISSING && state.serial != AltosLib.MISSING)
serial = state.serial;
@@
-157,6
+163,12
@@
public class AltosFlightStats {
lon = state.gps.lon;
has_gps = true;
}
lon = state.gps.lon;
has_gps = true;
}
+ if (state.imu != null)
+ has_imu = true;
+ if (state.mag != null)
+ has_mag = true;
+ if (state.orient() != AltosLib.MISSING)
+ has_orient = true;
}
for (int s = Altos.ao_flight_startup; s <= Altos.ao_flight_landed; s++) {
if (state_count[s] > 0) {
}
for (int s = Altos.ao_flight_startup; s <= Altos.ao_flight_landed; s++) {
if (state_count[s] > 0) {