]> git.gag.com Git - fw/altos/blobdiff - altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
altosdroid: Add idle mode monitoring, reboot. Start igniters
[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / AltosDroid.java
index 71ac298e77b6d6000d4620db1a16eddd57871b5b..e5f56a5a9688893c36688b51c854148da1704995 100644 (file)
@@ -45,13 +45,15 @@ import android.view.*;
 import android.widget.*;
 import android.app.AlertDialog;
 import android.location.Location;
+import android.location.LocationManager;
+import android.location.LocationListener;
 import android.hardware.usb.*;
 import android.graphics.*;
 import android.graphics.drawable.*;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_10.*;
 
-public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
+public class AltosDroid extends FragmentActivity implements AltosUnitsListener, LocationListener {
 
        // Actions sent to the telemetry server at startup time
 
@@ -62,12 +64,20 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 
        public static final int MSG_STATE           = 1;
        public static final int MSG_UPDATE_AGE      = 2;
+       public static final int MSG_IDLE_MODE       = 3;
+       public static final int MSG_IGNITER_STATUS  = 4;
 
        // Intent request codes
        public static final int REQUEST_CONNECT_DEVICE = 1;
        public static final int REQUEST_ENABLE_BT      = 2;
        public static final int REQUEST_PRELOAD_MAPS   = 3;
        public static final int REQUEST_MAP_TYPE       = 4;
+       public static final int REQUEST_IDLE_MODE      = 5;
+       public static final int REQUEST_IGNITERS       = 6;
+
+       public static final String EXTRA_IDLE_MODE = "idle_mode";
+       public static final String EXTRA_IDLE_RESULT = "idle_result";
+       public static final String EXTRA_TELEMETRY_SERVICE = "telemetry_service";
 
        public int map_type = AltosMap.maptype_hybrid;
 
@@ -98,6 +108,10 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
        private double frequency;
        private int telemetry_rate;
 
+       private boolean idle_mode = false;
+
+       public Location location = null;
+
        // Tabs
        TabHost         mTabHost;
        AltosViewPager  mViewPager;
@@ -142,6 +156,10 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
                        case MSG_UPDATE_AGE:
                                ad.update_age();
                                break;
+                       case MSG_IDLE_MODE:
+                               ad.idle_mode = (Boolean) msg.obj;
+                               ad.update_state(null);
+                               break;
                        }
                }
        };
@@ -212,8 +230,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
                switch (telemetry_state.connect) {
                case TelemetryState.CONNECT_CONNECTED:
                        if (telemetry_state.config != null) {
-                               String str = String.format("S/N %d %6.3f MHz", telemetry_state.config.serial,
-                                                          telemetry_state.frequency);
+                               String str = String.format("S/N %d %6.3f MHz%s", telemetry_state.config.serial,
+                                                          telemetry_state.frequency, idle_mode ? " (idle)" : "");
                                if (telemetry_state.telemetry_rate != AltosLib.ao_telemetry_rate_38400)
                                        str = str.concat(String.format(" %d bps",
                                                                       AltosLib.ao_telemetry_rate_values[telemetry_state.telemetry_rate]));
@@ -314,7 +332,7 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
                                state = newest_state;
                }
 
-               update_ui(telemetry_state, state, telemetry_state.location);
+               update_ui(telemetry_state, state);
 
                start_timer();
        }
@@ -379,19 +397,19 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
                }
        }
 
-       void update_ui(TelemetryState telem_state, AltosState state, Location location) {
+       void update_ui(TelemetryState telem_state, AltosState 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));
 
-                       if (state.state == AltosLib.ao_flight_stateless) {
+                       if (state.state() == AltosLib.ao_flight_stateless) {
                                boolean prev_locked = false;
                                boolean locked = false;
 
@@ -408,9 +426,9 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
                                        }
                                }
                        } else {
-                               if (prev_state != state.state) {
+                               if (prev_state != state.state()) {
                                        String currentTab = mTabHost.getCurrentTabTag();
-                                       switch (state.state) {
+                                       switch (state.state()) {
                                        case AltosLib.ao_flight_boost:
                                                if (currentTab.equals(tab_pad_name)) mTabHost.setCurrentTabByTag(tab_flight_name);
                                                break;
@@ -440,7 +458,10 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
                                mCallsignView.setText(state.callsign);
                        }
                        if (saved_state == null || state.serial != saved_state.serial) {
-                               mSerialView.setText(String.format("%d", state.serial));
+                               if (state.serial == AltosLib.MISSING)
+                                       mSerialView.setText("");
+                               else
+                                       mSerialView.setText(String.format("%d", state.serial));
                        }
                        if (saved_state == null || state.flight != saved_state.flight) {
                                if (state.flight == AltosLib.MISSING)
@@ -448,8 +469,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
                                else
                                        mFlightView.setText(String.format("%d", state.flight));
                        }
-                       if (saved_state == null || state.state != saved_state.state) {
-                               if (state.state == AltosLib.ao_flight_stateless) {
+                       if (saved_state == null || state.state() != saved_state.state()) {
+                               if (state.state() == AltosLib.ao_flight_stateless) {
                                        mStateLayout.setVisibility(View.GONE);
                                } else {
                                        mStateView.setText(state.state_name());
@@ -457,7 +478,10 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
                                }
                        }
                        if (saved_state == null || state.rssi != saved_state.rssi) {
-                               mRSSIView.setText(String.format("%d", state.rssi));
+                               if (state.rssi == AltosLib.MISSING)
+                                       mRSSIView.setText("");
+                               else
+                                       mRSSIView.setText(String.format("%d", state.rssi));
                        }
                }
 
@@ -560,22 +584,15 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
                mAgeOldColor   = getResources().getColor(R.color.old_color);
        }
 
-       private boolean ensureBluetooth() {
+       private void ensureBluetooth() {
                // Get local Bluetooth adapter
                mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
 
-               // If the adapter is null, then Bluetooth is not supported
-               if (mBluetoothAdapter == null) {
-                       Toast.makeText(this, "Bluetooth is not available", Toast.LENGTH_LONG).show();
-                       return false;
-               }
-
-               if (!mBluetoothAdapter.isEnabled()) {
+               /* if there is a BT adapter and it isn't turned on, then turn it on */
+               if (mBluetoothAdapter != null && !mBluetoothAdapter.isEnabled()) {
                        Intent enableIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
                        startActivityForResult(enableIntent, AltosDroid.REQUEST_ENABLE_BT);
                }
-
-               return true;
        }
 
        private boolean check_usb() {
@@ -641,9 +658,7 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
                                        return;
                        }
                        AltosDebug.debug("Starting by looking for bluetooth devices");
-                       if (ensureBluetooth())
-                               return;
-                       finish();
+                       ensureBluetooth();
                }
        }
 
@@ -679,12 +694,27 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
        public void onResume() {
                super.onResume();
                AltosDebug.debug("+ ON RESUME +");
+
+               // Listen for GPS and Network position updates
+               LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE);
+               locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 1000, 1, this);
+
+               location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
+
+               if (location != null)
+                       AltosDebug.debug("Resume, location is %f,%f\n",
+                                        location.getLatitude(),
+                                        location.getLongitude());
+
+               update_ui(telemetry_state, saved_state);
        }
 
        @Override
        public void onPause() {
                super.onPause();
                AltosDebug.debug("- ON PAUSE -");
+               // Stop listening for location updates
+               ((LocationManager) getSystemService(Context.LOCATION_SERVICE)).removeUpdates(this);
        }
 
        @Override
@@ -720,18 +750,23 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
                        if (resultCode == Activity.RESULT_OK) {
                                // Bluetooth is now enabled, so set up a chat session
                                //setupChat();
+                               AltosDebug.debug("BT enabled");
+                               bluetoothEnabled(data);
                        } else {
                                // User did not enable Bluetooth or an error occured
-                               AltosDebug.error("BT not enabled");
-                               stopService(new Intent(AltosDroid.this, TelemetryService.class));
-                               Toast.makeText(this, R.string.bt_not_enabled, Toast.LENGTH_SHORT).show();
-                               finish();
+                               AltosDebug.debug("BT not enabled");
                        }
                        break;
                case REQUEST_MAP_TYPE:
                        if (resultCode == Activity.RESULT_OK)
                                set_map_type(data);
                        break;
+               case REQUEST_IDLE_MODE:
+                       if (resultCode == Activity.RESULT_OK)
+                               idle_mode(data);
+                       break;
+               case REQUEST_IGNITERS:
+                       break;
                }
        }
 
@@ -749,6 +784,14 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
                }
        }
 
+       private void bluetoothEnabled(Intent data) {
+               try {
+                       mService.send(Message.obtain(null, TelemetryService.MSG_BLUETOOTH_ENABLED, null));
+               } catch (RemoteException e) {
+                       AltosDebug.debug("send BT enabled message failed");
+               }
+       }
+
        private void connectDevice(Intent data) {
                // Attempt to connect to the device
                try {
@@ -782,6 +825,40 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
                }
        }
 
+       private void idle_mode(Intent data) {
+               int type = data.getIntExtra(IdleModeActivity.EXTRA_IDLE_RESULT, -1);
+               Message msg;
+
+               AltosDebug.debug("intent idle_mode %d", type);
+               switch (type) {
+               case IdleModeActivity.IDLE_MODE_CONNECT:
+                       msg = Message.obtain(null, TelemetryService.MSG_MONITOR_IDLE_START);
+                       try {
+                               mService.send(msg);
+                       } catch (RemoteException re) {
+                       }
+                       break;
+               case IdleModeActivity.IDLE_MODE_DISCONNECT:
+                       msg = Message.obtain(null, TelemetryService.MSG_MONITOR_IDLE_STOP);
+                       try {
+                               mService.send(msg);
+                       } catch (RemoteException re) {
+                       }
+                       break;
+               case IdleModeActivity.IDLE_MODE_REBOOT:
+                       msg = Message.obtain(null, TelemetryService.MSG_REBOOT);
+                       try {
+                               mService.send(msg);
+                       } catch (RemoteException re) {
+                       }
+                       break;
+               case IdleModeActivity.IDLE_MODE_IGNITERS:
+                       Intent serverIntent = new Intent(this, IgniterActivity.class);
+                       startActivityForResult(serverIntent, REQUEST_IGNITERS);
+                       break;
+               }
+       }
+
        @Override
        public boolean onCreateOptionsMenu(Menu menu) {
                MenuInflater inflater = getMenuInflater();
@@ -889,11 +966,10 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
                Intent serverIntent = null;
                switch (item.getItemId()) {
                case R.id.connect_scan:
-                       if (ensureBluetooth()) {
-                               // Launch the DeviceListActivity to see devices and do scan
-                               serverIntent = new Intent(this, DeviceListActivity.class);
-                               startActivityForResult(serverIntent, REQUEST_CONNECT_DEVICE);
-                       }
+                       ensureBluetooth();
+                       // Launch the DeviceListActivity to see devices and do scan
+                       serverIntent = new Intent(this, DeviceListActivity.class);
+                       startActivityForResult(serverIntent, REQUEST_CONNECT_DEVICE);
                        return true;
                case R.id.disconnect:
                        /* Disconnect the device
@@ -1010,12 +1086,17 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 
                        }
                        return true;
+               case R.id.idle_mode:
+                       serverIntent = new Intent(this, IdleModeActivity.class);
+                       serverIntent.putExtra(EXTRA_IDLE_MODE, idle_mode);
+                       startActivityForResult(serverIntent, REQUEST_IDLE_MODE);
+                       return true;
                }
                return false;
        }
 
        static String direction(AltosGreatCircle from_receiver,
-                            Location receiver) {
+                               Location receiver) {
                if (from_receiver == null)
                        return null;
 
@@ -1044,4 +1125,24 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
                else
                        return String.format("right %d°", iheading);
        }
+
+       public void onLocationChanged(Location location) {
+               this.location = location;
+               AltosDebug.debug("Location changed to %f,%f",
+                                location.getLatitude(),
+                                location.getLongitude());
+               update_ui(telemetry_state, saved_state);
+       }
+
+       public void onStatusChanged(String provider, int status, Bundle extras) {
+               AltosDebug.debug("Location status now %d\n", status);
+       }
+
+       public void onProviderEnabled(String provider) {
+               AltosDebug.debug("Location provider enabled %s\n", provider);
+       }
+
+       public void onProviderDisabled(String provider) {
+               AltosDebug.debug("Location provider disabled %s\n", provider);
+       }
 }