X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosFlightStats.java;h=39e8cdae106ea3ea165fdc6c32e802172c2eaa23;hb=55db3b3e8addaa2dc0af50470d3bc8c25cb57df3;hp=677230e1e057e558ef9f7fc0aa13105994cfda12;hpb=58f06706383418ebfa56d88ba51411e6185e09df;p=fw%2Faltos diff --git a/altoslib/AltosFlightStats.java b/altoslib/AltosFlightStats.java index 677230e1..39e8cdae 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_9; import java.io.*; @@ -38,6 +38,7 @@ public class AltosFlightStats { 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; @@ -51,7 +52,7 @@ public class AltosFlightStats { for (AltosState s : states) { state = s; - if (state.state == AltosLib.ao_flight_landed) + if (state.state() == AltosLib.ao_flight_landed) break; } @@ -91,7 +92,7 @@ public class AltosFlightStats { state = s; if (state.acceleration() < 1) boost_time = state.time; - if (state.state >= AltosLib.ao_flight_boost && state.state <= AltosLib.ao_flight_landed) + if (state.state() >= AltosLib.ao_flight_boost && state.state() <= AltosLib.ao_flight_landed) break; } if (state == null) @@ -137,7 +138,7 @@ public class AltosFlightStats { if (state.pressure() != AltosLib.MISSING) has_flight_data = true; - int state_id = state.state; + int state_id = state.state(); if (state.time >= boost_time && state_id < AltosLib.ao_flight_boost) state_id = AltosLib.ao_flight_boost; if (state.time >= landed_time && state_id < AltosLib.ao_flight_landed) @@ -178,6 +179,8 @@ public class AltosFlightStats { 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;