altoslib: Hide 'state' member and use accessor function

[fw/altos] / altoslib / AltosFlightStats.java

diff --git a/altoslib/AltosFlightStats.java b/altoslib/AltosFlightStats.java
index 1b88cb9fc7e56e7b8b2abf7ae308571837c862ad..fdf79fa2adb471f34372fb3bb7035129d237f5ca 100644 (file)
--- 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_8;
 
 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;
@@ -50,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;
                }
 
@@ -90,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)
@@ -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;
@@ -135,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)
@@ -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;