altosdroid: cal_data is no longer public from AltosState
[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / AltosDroid.java
index 385348ea247ed439dbf4947c59ffb6b64eecfdb5..924ab4c9350a4564bdcb532b04e47777ead16bef 100644 (file)
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -51,7 +52,30 @@ import android.hardware.usb.*;
 import android.graphics.*;
 import android.graphics.drawable.*;
 
-import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altoslib_12.*;
+
+class SavedState {
+       long    received_time;
+       int     state;
+       boolean locked;
+       String  callsign;
+       int     serial;
+       int     flight;
+       int     rssi;
+
+       SavedState(AltosState state) {
+               received_time = state.received_time;
+               this.state = state.state();
+               if (state.gps != null)
+                       locked = state.gps.locked;
+               else
+                       locked = false;
+               callsign = state.cal_data().callsign;
+               serial = state.cal_data().serial;
+               flight = state.cal_data().flight;
+               rssi = state.rssi;
+       }
+}
 
 public class AltosDroid extends FragmentActivity implements AltosUnitsListener, LocationListener {
 
@@ -113,6 +137,9 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
 
        public Location location = null;
 
+       private AltosState      state;
+       private SavedState      saved_state;
+
        // Tabs
        TabHost         mTabHost;
        AltosViewPager  mViewPager;
@@ -122,7 +149,7 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
 
        // Timer and Saved flight state for Age calculation
        private Timer timer;
-       AltosState saved_state;
+
        TelemetryState  telemetry_state;
        Integer[]       serials;
 
@@ -306,7 +333,7 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
 
                if (telemetry_state.states.containsKey(current_serial)) {
                        state = telemetry_state.states.get(current_serial);
-                       int age = state_age(state);
+                       int age = state_age(state.received_time);
                        if (age < 20)
                                aged = false;
                        if (current_serial == selected_serial)
@@ -321,7 +348,7 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
 
                        for (int serial : telemetry_state.states.keySet()) {
                                AltosState      existing = telemetry_state.states.get(serial);
-                               int             existing_age = state_age(existing);
+                               int             existing_age = state_age(existing.received_time);
 
                                if (newest_state == null || existing_age < newest_age) {
                                        newest_state = existing;
@@ -333,7 +360,7 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
                                state = newest_state;
                }
 
-               update_ui(telemetry_state, state);
+               update_ui(telemetry_state, state, telemetry_state.quiet);
 
                start_timer();
        }
@@ -361,8 +388,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
                        blend_component(a, b, r, 24, 0xff));
        }
 
-       int state_age(AltosState state) {
-               return (int) ((System.currentTimeMillis() - state.received_time + 500) / 1000);
+       int state_age(long received_time) {
+               return (int) ((System.currentTimeMillis() - received_time + 500) / 1000);
        }
 
        void set_screen_on(int age) {
@@ -374,7 +401,7 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
 
        void update_age() {
                if (saved_state != null) {
-                       int age = state_age(saved_state);
+                       int age = state_age(saved_state.received_time);
 
                        double age_scale = age / 100.0;
 
@@ -398,17 +425,19 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
                }
        }
 
-       void update_ui(TelemetryState telem_state, AltosState state) {
+       void update_ui(TelemetryState telem_state, AltosState state, boolean quiet) {
+
+               this.state = state;
 
                int prev_state = AltosLib.ao_flight_invalid;
 
                AltosGreatCircle from_receiver = null;
 
                if (saved_state != null)
-                       prev_state = saved_state.state();
+                       prev_state = saved_state.state;
 
                if (state != null) {
-                       set_screen_on(state_age(state));
+                       set_screen_on(state_age(state.received_time));
 
                        if (state.state() == AltosLib.ao_flight_stateless) {
                                boolean prev_locked = false;
@@ -416,8 +445,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
 
                                if(state.gps != null)
                                        locked = state.gps.locked;
-                               if (saved_state != null && saved_state.gps != null)
-                                       prev_locked = saved_state.gps.locked;
+                               if (saved_state != null)
+                                       prev_locked = saved_state.locked;
                                if (prev_locked != locked) {
                                        String currentTab = mTabHost.getCurrentTabTag();
                                        if (locked) {
@@ -455,22 +484,22 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
                                                                     state.gps.alt);
                        }
 
-                       if (saved_state == null || !same_string(saved_state.callsign, state.callsign)) {
-                               mCallsignView.setText(state.callsign);
+                       if (saved_state == null || !same_string(saved_state.callsign, state.cal_data().callsign)) {
+                               mCallsignView.setText(state.cal_data().callsign);
                        }
-                       if (saved_state == null || state.serial != saved_state.serial) {
-                               if (state.serial == AltosLib.MISSING)
+                       if (saved_state == null || state.cal_data().serial != saved_state.serial) {
+                               if (state.cal_data().serial == AltosLib.MISSING)
                                        mSerialView.setText("");
                                else
-                                       mSerialView.setText(String.format("%d", state.serial));
+                                       mSerialView.setText(String.format("%d", state.cal_data().serial));
                        }
-                       if (saved_state == null || state.flight != saved_state.flight) {
-                               if (state.flight == AltosLib.MISSING)
+                       if (saved_state == null || state.cal_data().flight != saved_state.flight) {
+                               if (state.cal_data().flight == AltosLib.MISSING)
                                        mFlightView.setText("");
                                else
-                                       mFlightView.setText(String.format("%d", state.flight));
+                                       mFlightView.setText(String.format("%d", state.cal_data().flight));
                        }
-                       if (saved_state == null || state.state() != saved_state.state()) {
+                       if (saved_state == null || state.state() != saved_state.state) {
                                if (state.state() == AltosLib.ao_flight_stateless) {
                                        mStateLayout.setVisibility(View.GONE);
                                } else {
@@ -484,15 +513,16 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
                                else
                                        mRSSIView.setText(String.format("%d", state.rssi));
                        }
+                       saved_state = new SavedState(state);
                }
 
                for (AltosDroidTab mTab : mTabs)
                        mTab.update_ui(telem_state, state, from_receiver, location, mTab == mTabsAdapter.currentItem());
 
+               AltosDebug.debug("quiet %b\n", quiet);
                if (mAltosVoice != null)
-                       mAltosVoice.tell(telem_state, state, from_receiver, location, (AltosDroidTab) mTabsAdapter.currentItem());
+                       mAltosVoice.tell(telem_state, state, from_receiver, location, (AltosDroidTab) mTabsAdapter.currentItem(), quiet);
 
-               saved_state = state;
        }
 
        private void onTimerTick() {
@@ -566,8 +596,9 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
                // Display the Version
                mVersion = (TextView) findViewById(R.id.version);
                mVersion.setText("Version: " + BuildInfo.version +
-                                "  Built: " + BuildInfo.builddate + " " + BuildInfo.buildtime + " " + BuildInfo.buildtz +
-                                "  (" + BuildInfo.branch + "-" + BuildInfo.commitnum + "-" + BuildInfo.commithash + ")");
+                                (AltosVersion.has_google_maps_api_key() ? " maps" : "") +
+                                " Built: " + BuildInfo.builddate + " " + BuildInfo.buildtime + " " + BuildInfo.buildtz +
+                                " (" + BuildInfo.branch + "-" + BuildInfo.commitnum + "-" + BuildInfo.commithash + ")");
 
                mCallsignView  = (TextView) findViewById(R.id.callsign_value);
                mRSSIView      = (TextView) findViewById(R.id.rssi_value);
@@ -702,7 +733,7 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
                                         location.getLatitude(),
                                         location.getLongitude());
 
-               update_ui(telemetry_state, saved_state);
+               update_ui(telemetry_state, state, true);
        }
 
        @Override
@@ -825,9 +856,9 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
                }
        }
 
-       private void disconnectDevice() {
+       private void disconnectDevice(boolean remember) {
                try {
-                       mService.send(Message.obtain(null, TelemetryService.MSG_DISCONNECT, null));
+                       mService.send(Message.obtain(null, TelemetryService.MSG_DISCONNECT, (Boolean) remember));
                } catch (RemoteException e) {
                }
        }
@@ -978,11 +1009,11 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
                case R.id.disconnect:
                        /* Disconnect the device
                         */
-                       disconnectDevice();
+                       disconnectDevice(false);
                        return true;
                case R.id.quit:
                        AltosDebug.debug("R.id.quit");
-                       disconnectDevice();
+                       disconnectDevice(true);
                        finish();
                        return true;
                case R.id.setup:
@@ -1093,7 +1124,7 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
                AltosDebug.debug("Location changed to %f,%f",
                                 location.getLatitude(),
                                 location.getLongitude());
-               update_ui(telemetry_state, saved_state);
+               update_ui(telemetry_state, state, false);
        }
 
        public void onStatusChanged(String provider, int status, Bundle extras) {