X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=dd87614b81552467c75c0088f44876b83a36c180;hp=ebbe9330867ae515aa8b91022f6ebd945da284bb;hb=7975d088a4ac44c0943134fa41d0e3b88f50b98f;hpb=7701e142f9e3a81c536c546c9a0abfb3ba709abc

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index ebbe9330..dd87614b 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -21,8 +21,10 @@ import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.text.*;
 
 import android.app.Activity;
+import android.app.PendingIntent;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.content.Intent;
@@ -36,36 +38,49 @@ import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
+import android.content.res.Resources;
 import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentManager;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.Window;
+import android.view.View;
+import android.view.LayoutInflater;
 import android.widget.TabHost;
 import android.widget.TextView;
+import android.widget.RelativeLayout;
 import android.widget.Toast;
 import android.app.AlertDialog;
 import android.location.Location;
+import android.hardware.usb.*;
 
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_7.*;
 
-public class AltosDroid extends FragmentActivity {
+public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 	// Debugging
-	private static final String TAG = "AltosDroid";
-	private static final boolean D = true;
+	static final String TAG = "AltosDroid";
+	static final boolean D = true;
+
+	// Actions sent to the telemetry server at startup time
+
+	public static final String ACTION_BLUETOOTH = "org.altusmetrum.AltosDroid.BLUETOOTH";
+	public static final String ACTION_USB = "org.altusmetrum.AltosDroid.USB";
 
 	// Message types received by our Handler
-	public static final int MSG_STATE_CHANGE    = 1;
-	public static final int MSG_TELEMETRY       = 2;
-	public static final int MSG_UPDATE_AGE      = 3;
-	public static final int MSG_LOCATION	    = 4;
-	public static final int MSG_CRC_ERROR	    = 5;
+
+	public static final int MSG_STATE           = 1;
+	public static final int MSG_UPDATE_AGE      = 2;
 
 	// Intent request codes
-	private static final int REQUEST_CONNECT_DEVICE = 1;
-	private static final int REQUEST_ENABLE_BT      = 2;
+	public static final int REQUEST_CONNECT_DEVICE = 1;
+	public static final int REQUEST_ENABLE_BT      = 2;
+
+	public static FragmentManager	fm;
+
+	private BluetoothAdapter mBluetoothAdapter = null;
 
 	// Layout Views
 	private TextView mTitle;
@@ -75,12 +90,16 @@ public class AltosDroid extends FragmentActivity {
 	private TextView mRSSIView;
 	private TextView mSerialView;
 	private TextView mFlightView;
+	private RelativeLayout mStateLayout;
 	private TextView mStateView;
 	private TextView mAgeView;
 
 	// field to display the version at the bottom of the screen
 	private TextView mVersion;
 
+	private double frequency;
+	private int telemetry_rate;
+
 	// Tabs
 	TabHost         mTabHost;
 	AltosViewPager  mViewPager;
@@ -89,23 +108,17 @@ public class AltosDroid extends FragmentActivity {
 	int             tabHeight;
 
 	// Timer and Saved flight state for Age calculation
-	private Timer timer = new Timer();
+	private Timer timer;
 	AltosState saved_state;
-	Location saved_location;
+
+	UsbDevice	pending_usb_device;
+	boolean		start_with_usb;
 
 	// Service
 	private boolean mIsBound   = false;
 	private Messenger mService = null;
 	final Messenger mMessenger = new Messenger(new IncomingHandler(this));
 
-	// Preferences
-	private AltosDroidPreferences prefs = null;
-
-	// TeleBT Config data
-	private AltosConfigData mConfigData = null;
-	// Local Bluetooth adapter
-	private BluetoothAdapter mBluetoothAdapter = null;
-
 	// Text to Speech
 	private AltosVoice mAltosVoice = null;
 
@@ -117,38 +130,21 @@ public class AltosDroid extends FragmentActivity {
 		@Override
 		public void handleMessage(Message msg) {
 			AltosDroid ad = mAltosDroid.get();
+
 			switch (msg.what) {
-			case MSG_STATE_CHANGE:
-				if(D) Log.d(TAG, "MSG_STATE_CHANGE: " + msg.arg1);
-				switch (msg.arg1) {
-				case TelemetryService.STATE_CONNECTED:
-					ad.mConfigData = (AltosConfigData) msg.obj;
-					String str = String.format(" %s S/N: %d", ad.mConfigData.product, ad.mConfigData.serial);
-					ad.mTitle.setText(R.string.title_connected_to);
-					ad.mTitle.append(str);
-					Toast.makeText(ad.getApplicationContext(), "Connected to " + str, Toast.LENGTH_SHORT).show();
-					break;
-				case TelemetryService.STATE_CONNECTING:
-					ad.mTitle.setText(R.string.title_connecting);
-					break;
-				case TelemetryService.STATE_READY:
-				case TelemetryService.STATE_NONE:
-					ad.mConfigData = null;
-					ad.mTitle.setText(R.string.title_not_connected);
-					break;
+			case MSG_STATE:
+				if(D) Log.d(TAG, "MSG_STATE");
+				TelemetryState telemetry_state = (TelemetryState) msg.obj;
+				if (telemetry_state == null) {
+					Log.d(TAG, "telemetry_state null!");
+					return;
 				}
+
+				ad.update_state(telemetry_state);
 				break;
-			case MSG_TELEMETRY:
-				ad.update_ui((AltosState) msg.obj);
-				break;
-			case MSG_LOCATION:
-				ad.set_location((Location) msg.obj);
-				break;
-			case MSG_CRC_ERROR:
 			case MSG_UPDATE_AGE:
-				if (ad.saved_state != null) {
-					ad.mAgeView.setText(String.format("%d", (System.currentTimeMillis() - ad.saved_state.report_time + 500) / 1000));
-				}
+				if(D) Log.d(TAG, "MSG_UPDATE_AGE");
+				ad.update_age();
 				break;
 			}
 		}
@@ -165,6 +161,13 @@ public class AltosDroid extends FragmentActivity {
 			} catch (RemoteException e) {
 				// In this case the service has crashed before we could even do anything with it
 			}
+			if (pending_usb_device != null) {
+				try {
+					mService.send(Message.obtain(null, TelemetryService.MSG_OPEN_USB, pending_usb_device));
+					pending_usb_device = null;
+				} catch (RemoteException e) {
+				}
+			}
 		}
 
 		public void onServiceDisconnected(ComponentName className) {
@@ -204,57 +207,175 @@ public class AltosDroid extends FragmentActivity {
 		mTabs.remove(mTab);
 	}
 
-	void set_location(Location location) {
-		saved_location = location;
-		update_ui(saved_state);
-	}
-
-	void update_ui(AltosState state) {
-		if (state != null && saved_state != null) {
-			if (saved_state.state != state.state) {
-				String currentTab = mTabHost.getCurrentTabTag();
-				switch (state.state) {
-				case AltosLib.ao_flight_boost:
-					if (currentTab.equals("pad")) mTabHost.setCurrentTabByTag("ascent");
-					break;
-				case AltosLib.ao_flight_drogue:
-					if (currentTab.equals("ascent")) mTabHost.setCurrentTabByTag("descent");
-					break;
-				case AltosLib.ao_flight_landed:
-					if (currentTab.equals("descent")) mTabHost.setCurrentTabByTag("landed");
-					break;
-				}
+	public void units_changed(boolean imperial_units) {
+		for (AltosDroidTab mTab : mTabs)
+			mTab.units_changed(imperial_units);
+	}
+
+	void update_title(TelemetryState telemetry_state) {
+		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);
+				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]));
+				mTitle.setText(str);
+			} else {
+				mTitle.setText(R.string.title_connected_to);
 			}
+			break;
+		case TelemetryState.CONNECT_CONNECTING:
+			if (telemetry_state.address != null)
+				mTitle.setText(String.format("Connecting to %s...", telemetry_state.address.name));
+			else
+				mTitle.setText("Connecting to something...");
+			break;
+		case TelemetryState.CONNECT_DISCONNECTED:
+		case TelemetryState.CONNECT_NONE:
+			mTitle.setText(R.string.title_not_connected);
+			break;
 		}
-		saved_state = state;
+	}
 
-		AltosGreatCircle from_receiver = null;
+	void start_timer() {
+		if (timer == null) {
+			timer = new Timer();
+			timer.scheduleAtFixedRate(new TimerTask(){ public void run() {onTimerTick();}}, 1000L, 1000L);
+		}
+	}
+
+	void stop_timer() {
+		if (timer != null) {
+			timer.cancel();
+			timer.purge();
+			timer = null;
+		}
+	}
+
+	boolean	registered_units_listener;
+
+	void update_state(TelemetryState telemetry_state) {
 
-		if (state != null && saved_location != null && state.gps != null && state.gps.locked) {
-			double altitude = 0;
-			if (saved_location.hasAltitude())
-				altitude = saved_location.getAltitude();
-			from_receiver = new AltosGreatCircle(saved_location.getLatitude(),
-							     saved_location.getLongitude(),
-							     altitude,
-							     state.gps.lat,
-							     state.gps.lon,
-							     state.gps.alt);
+		if (!registered_units_listener) {
+			registered_units_listener = true;
+			AltosPreferences.register_units_listener(this);
 		}
 
+		update_title(telemetry_state);
+		update_ui(telemetry_state.state, telemetry_state.location);
+		if (telemetry_state.connect == TelemetryState.CONNECT_CONNECTED)
+			start_timer();
+	}
+
+	boolean same_string(String a, String b) {
+		if (a == null) {
+			if (b == null)
+				return true;
+			return false;
+		} else {
+			if (b == null)
+				return false;
+			return a.equals(b);
+		}
+	}
+
+	void update_age() {
+		if (saved_state != null)
+			mAgeView.setText(String.format("%d", (System.currentTimeMillis() - saved_state.received_time + 500) / 1000));
+	}
+
+	void update_ui(AltosState state, Location location) {
+
+		int prev_state = AltosLib.ao_flight_invalid;
+
+		AltosGreatCircle from_receiver = null;
+
+		if (saved_state != null)
+			prev_state = saved_state.state;
+
 		if (state != null) {
-			mCallsignView.setText(state.data.callsign);
-			mSerialView.setText(String.format("%d", state.data.serial));
-			mFlightView.setText(String.format("%d", state.data.flight));
-			mStateView.setText(state.data.state());
-			mRSSIView.setText(String.format("%d", state.data.rssi));
+			if (state.state == AltosLib.ao_flight_stateless) {
+				boolean	prev_locked = false;
+				boolean locked = false;
+
+				if(state.gps != null)
+					locked = state.gps.locked;
+				if (saved_state != null && saved_state.gps != null)
+					prev_locked = saved_state.gps.locked;
+				if (prev_locked != locked) {
+					String currentTab = mTabHost.getCurrentTabTag();
+					if (locked) {
+						if (currentTab.equals("pad")) mTabHost.setCurrentTabByTag("descent");
+					} else {
+						if (currentTab.equals("descent")) mTabHost.setCurrentTabByTag("pad");
+					}
+				}
+			} else {
+				if (prev_state != state.state) {
+					String currentTab = mTabHost.getCurrentTabTag();
+					switch (state.state) {
+					case AltosLib.ao_flight_boost:
+						if (currentTab.equals("pad")) mTabHost.setCurrentTabByTag("ascent");
+						break;
+					case AltosLib.ao_flight_drogue:
+						if (currentTab.equals("ascent")) mTabHost.setCurrentTabByTag("descent");
+						break;
+					case AltosLib.ao_flight_landed:
+						if (currentTab.equals("descent")) mTabHost.setCurrentTabByTag("landed");
+						break;
+					case AltosLib.ao_flight_stateless:
+						if (currentTab.equals("pad")) mTabHost.setCurrentTabByTag("descent");
+						break;
+					}
+				}
+			}
+
+			if (location != null && state.gps != null && state.gps.locked) {
+				double altitude = 0;
+				if (location.hasAltitude())
+					altitude = location.getAltitude();
+				from_receiver = new AltosGreatCircle(location.getLatitude(),
+								     location.getLongitude(),
+								     altitude,
+								     state.gps.lat,
+								     state.gps.lon,
+								     state.gps.alt);
+			}
+
+			if (saved_state == null || !same_string(saved_state.callsign, state.callsign)) {
+				mCallsignView.setText(state.callsign);
+			}
+			if (saved_state == null || state.serial != saved_state.serial) {
+				mSerialView.setText(String.format("%d", state.serial));
+			}
+			if (saved_state == null || state.flight != saved_state.flight) {
+				if (state.flight == AltosLib.MISSING)
+					mFlightView.setText("");
+				else
+					mFlightView.setText(String.format("%d", state.flight));
+			}
+			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());
+					mStateLayout.setVisibility(View.VISIBLE);
+				}
+			}
+			if (saved_state == null || state.rssi != saved_state.rssi) {
+				mRSSIView.setText(String.format("%d", state.rssi));
+			}
 		}
 
 		for (AltosDroidTab mTab : mTabs)
-			mTab.update_ui(state, from_receiver, saved_location);
+			mTab.update_ui(state, from_receiver, location, mTab == mTabsAdapter.currentItem());
 
-		if (state != null)
-			mAltosVoice.tell(state);
+		if (state != null && mAltosVoice != null)
+			mAltosVoice.tell(state, from_receiver);
+
+		saved_state = state;
 	}
 
 	private void onTimerTick() {
@@ -266,7 +387,7 @@ public class AltosDroid extends FragmentActivity {
 
 	static String pos(double p, String pos, String neg) {
 		String	h = pos;
-		if (p == AltosRecord.MISSING)
+		if (p == AltosLib.MISSING)
 			return "";
 		if (p < 0) {
 			h = neg;
@@ -278,35 +399,31 @@ public class AltosDroid extends FragmentActivity {
 	}
 
 	static String number(String format, double value) {
-		if (value == AltosRecord.MISSING)
+		if (value == AltosLib.MISSING)
 			return "";
 		return String.format(format, value);
 	}
 
 	static String integer(String format, int value) {
-		if (value == AltosRecord.MISSING)
+		if (value == AltosLib.MISSING)
 			return "";
 		return String.format(format, value);
 	}
 
+	private View create_tab_view(String label) {
+		LayoutInflater inflater = (LayoutInflater) this.getLayoutInflater();
+		View tab_view = inflater.inflate(R.layout.tab_layout, null);
+		TextView text_view = (TextView) tab_view.findViewById (R.id.tabLabel);
+		text_view.setText(label);
+		return tab_view;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		if(D) Log.e(TAG, "+++ ON CREATE +++");
 
-		// 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();
-			finish();
-			return;
-		}
-
-		// Initialise preferences
-		prefs = new AltosDroidPreferences(this);
-		AltosPreferences.init(prefs);
+		fm = getSupportFragmentManager();
 
 		// Set up the window layout
 		requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
@@ -322,33 +439,12 @@ public class AltosDroid extends FragmentActivity {
 
 		mTabsAdapter = new TabsAdapter(this, mTabHost, mViewPager);
 
-		mTabsAdapter.addTab(mTabHost.newTabSpec("pad").setIndicator("Pad"), TabPad.class, null);
-		mTabsAdapter.addTab(mTabHost.newTabSpec("ascent").setIndicator("Ascent"), TabAscent.class, null);
-		mTabsAdapter.addTab(mTabHost.newTabSpec("descent").setIndicator("Descent"), TabDescent.class, null);
-		mTabsAdapter.addTab(mTabHost.newTabSpec("landed").setIndicator("Landed"), TabLanded.class, null);
-		mTabsAdapter.addTab(mTabHost.newTabSpec("map").setIndicator("Map"), TabMap.class, null);
-
-
-		// Scale the size of the Tab bar for different screen densities
-		// This probably won't be needed when we start supporting ICS+ tabs.
-		DisplayMetrics metrics = new DisplayMetrics();
-		getWindowManager().getDefaultDisplay().getMetrics(metrics);
-		int density = metrics.densityDpi;
-
-		if (density==DisplayMetrics.DENSITY_XHIGH)
-			tabHeight = 65;
-		else if (density==DisplayMetrics.DENSITY_HIGH)
-			tabHeight = 45;
-		else if (density==DisplayMetrics.DENSITY_MEDIUM)
-			tabHeight = 35;
-		else if (density==DisplayMetrics.DENSITY_LOW)
-			tabHeight = 25;
-		else
-			tabHeight = 65;
-
-		for (int i = 0; i < 5; i++)
-			mTabHost.getTabWidget().getChildAt(i).getLayoutParams().height = tabHeight;
-
+		mTabsAdapter.addTab(mTabHost.newTabSpec("pad").setIndicator(create_tab_view("Pad")), TabPad.class, null);
+		mTabsAdapter.addTab(mTabHost.newTabSpec("ascent").setIndicator(create_tab_view("Ascent")), TabAscent.class, null);
+		mTabsAdapter.addTab(mTabHost.newTabSpec("descent").setIndicator(create_tab_view("Descent")), TabDescent.class, null);
+		mTabsAdapter.addTab(mTabHost.newTabSpec("landed").setIndicator(create_tab_view("Landed")), TabLanded.class, null);
+		mTabsAdapter.addTab(mTabHost.newTabSpec("map").setIndicator(create_tab_view("Map")), TabMap.class, null);
+		mTabsAdapter.addTab(mTabHost.newTabSpec("offmap").setIndicator(create_tab_view("OffMap")), TabMapOffline.class, null);
 
 		// Set up the custom title
 		mTitle = (TextView) findViewById(R.id.title_left_text);
@@ -365,12 +461,96 @@ public class AltosDroid extends FragmentActivity {
 		mRSSIView      = (TextView) findViewById(R.id.rssi_value);
 		mSerialView    = (TextView) findViewById(R.id.serial_value);
 		mFlightView    = (TextView) findViewById(R.id.flight_value);
+		mStateLayout   = (RelativeLayout) findViewById(R.id.state_container);
 		mStateView     = (TextView) findViewById(R.id.state_value);
 		mAgeView       = (TextView) findViewById(R.id.age_value);
+	}
+
+	private boolean 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;
+		}
 
-		timer.scheduleAtFixedRate(new TimerTask(){ public void run() {onTimerTick();}}, 1000L, 100L);
+		if (!mBluetoothAdapter.isEnabled()) {
+			Intent enableIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
+			startActivityForResult(enableIntent, AltosDroid.REQUEST_ENABLE_BT);
+		}
 
-		mAltosVoice = new AltosVoice(this);
+		return true;
+	}
+
+	private boolean check_usb() {
+		UsbDevice	device = AltosUsb.find_device(this, AltosLib.product_basestation);
+
+		if (device != null) {
+			Intent		i = new Intent(this, AltosDroid.class);
+			PendingIntent	pi = PendingIntent.getActivity(this, 0, new Intent("hello world", null, this, AltosDroid.class), 0);
+
+			if (AltosUsb.request_permission(this, device, pi)) {
+				connectUsb(device);
+			}
+			start_with_usb = true;
+			return true;
+		}
+
+		start_with_usb = false;
+
+		return false;
+	}
+
+	private void noticeIntent(Intent intent) {
+
+		/* Ok, this is pretty convenient.
+		 *
+		 * When a USB device is plugged in, and our 'hotplug'
+		 * intent registration fires, we get an Intent with
+		 * EXTRA_DEVICE set.
+		 *
+		 * When we start up and see a usb device and request
+		 * permission to access it, that queues a
+		 * PendingIntent, which has the EXTRA_DEVICE added in,
+		 * along with the EXTRA_PERMISSION_GRANTED field as
+		 * well.
+		 *
+		 * So, in both cases, we get the device name using the
+		 * same call. We check to see if access was granted,
+		 * in which case we ignore the device field and do our
+		 * usual startup thing.
+		 */
+
+		UsbDevice device = (UsbDevice) intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+		boolean granted = intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, true);
+
+		if (D) Log.e(TAG, "intent " + intent + " device " + device + " granted " + granted);
+
+		if (!granted)
+			device = null;
+
+		if (device != null) {
+			if (D) Log.d(TAG, "intent has usb device " + device.toString());
+			connectUsb(device);
+		} else {
+
+			/* 'granted' is only false if this intent came
+			 * from the request_permission call and
+			 * permission was denied. In which case, we
+			 * don't want to loop forever...
+			 */
+			if (granted) {
+				if (D) Log.d(TAG, "check for a USB device at startup");
+				if (check_usb())
+					return;
+			}
+			if (D) Log.d(TAG, "Starting by looking for bluetooth devices");
+			if (ensureBluetooth())
+				return;
+			finish();
+		}
 	}
 
 	@Override
@@ -378,25 +558,35 @@ public class AltosDroid extends FragmentActivity {
 		super.onStart();
 		if(D) Log.e(TAG, "++ ON START ++");
 
-		if (!mBluetoothAdapter.isEnabled()) {
-			Intent enableIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
-			startActivityForResult(enableIntent, REQUEST_ENABLE_BT);
-		}
+		noticeIntent(getIntent());
 
 		// Start Telemetry Service
-		startService(new Intent(AltosDroid.this, TelemetryService.class));
+		String	action = start_with_usb ? ACTION_USB : ACTION_BLUETOOTH;
+
+		startService(new Intent(action, null, AltosDroid.this, TelemetryService.class));
 
 		doBindService();
+
+		if (mAltosVoice == null)
+			mAltosVoice = new AltosVoice(this);
+
+	}
+
+	@Override
+	public void onNewIntent(Intent intent) {
+		super.onNewIntent(intent);
+		if(D) Log.d(TAG, "onNewIntent");
+		noticeIntent(intent);
 	}
 
 	@Override
-	public synchronized void onResume() {
+	public void onResume() {
 		super.onResume();
 		if(D) Log.e(TAG, "+ ON RESUME +");
 	}
 
 	@Override
-	public synchronized void onPause() {
+	public void onPause() {
 		super.onPause();
 		if(D) Log.e(TAG, "- ON PAUSE -");
 	}
@@ -407,6 +597,10 @@ public class AltosDroid extends FragmentActivity {
 		if(D) Log.e(TAG, "-- ON STOP --");
 
 		doUnbindService();
+		if (mAltosVoice != null) {
+			mAltosVoice.stop();
+			mAltosVoice = null;
+		}
 	}
 
 	@Override
@@ -414,10 +608,11 @@ public class AltosDroid extends FragmentActivity {
 		super.onDestroy();
 		if(D) Log.e(TAG, "--- ON DESTROY ---");
 
-		mAltosVoice.stop();
+		if (mAltosVoice != null) mAltosVoice.stop();
+		stop_timer();
 	}
 
-	public void onActivityResult(int requestCode, int resultCode, Intent data) {
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 		if(D) Log.d(TAG, "onActivityResult " + resultCode);
 		switch (requestCode) {
 		case REQUEST_CONNECT_DEVICE:
@@ -442,15 +637,38 @@ public class AltosDroid extends FragmentActivity {
 		}
 	}
 
+	private void connectUsb(UsbDevice device) {
+		if (mService == null)
+			pending_usb_device = device;
+		else {
+			// Attempt to connect to the device
+			try {
+				mService.send(Message.obtain(null, TelemetryService.MSG_OPEN_USB, device));
+				if (D) Log.d(TAG, "Sent OPEN_USB message");
+			} catch (RemoteException e) {
+				if (D) Log.e(TAG, "connect device message failed");
+			}
+		}
+	}
+
 	private void connectDevice(Intent data) {
-		// Get the device MAC address
-		String address = data.getExtras().getString(DeviceListActivity.EXTRA_DEVICE_ADDRESS);
-		// Get the BLuetoothDevice object
-		BluetoothDevice device = mBluetoothAdapter.getRemoteDevice(address);
 		// Attempt to connect to the device
 		try {
-			if (D) Log.d(TAG, "Connecting to " + device.getName());
-			mService.send(Message.obtain(null, TelemetryService.MSG_CONNECT, device));
+			String address = data.getExtras().getString(DeviceListActivity.EXTRA_DEVICE_ADDRESS);
+			String name = data.getExtras().getString(DeviceListActivity.EXTRA_DEVICE_NAME);
+
+			if (D) Log.d(TAG, "Connecting to " + address + " " + name);
+			DeviceAddress	a = new DeviceAddress(address, name);
+			mService.send(Message.obtain(null, TelemetryService.MSG_CONNECT, a));
+			if (D) Log.d(TAG, "Sent connecting message");
+		} catch (RemoteException e) {
+			if (D) Log.e(TAG, "connect device message failed");
+		}
+	}
+
+	private void disconnectDevice() {
+		try {
+			mService.send(Message.obtain(null, TelemetryService.MSG_DISCONNECT, null));
 		} catch (RemoteException e) {
 		}
 	}
@@ -471,7 +689,34 @@ public class AltosDroid extends FragmentActivity {
 
 	void setFrequency(String freq) {
 		try {
-			setFrequency (Double.parseDouble(freq.substring(11, 17)));
+			setFrequency (AltosParse.parse_double_net(freq.substring(11, 17)));
+		} catch (ParseException e) {
+		}
+	}
+
+	void setBaud(int baud) {
+		try {
+			mService.send(Message.obtain(null, TelemetryService.MSG_SETBAUD, baud));
+		} catch (RemoteException e) {
+		}
+	}
+
+	void setBaud(String baud) {
+		try {
+			int	value = Integer.parseInt(baud);
+			int	rate = AltosLib.ao_telemetry_rate_38400;
+			switch (value) {
+			case 2400:
+				rate = AltosLib.ao_telemetry_rate_2400;
+				break;
+			case 9600:
+				rate = AltosLib.ao_telemetry_rate_9600;
+				break;
+			case 38400:
+				rate = AltosLib.ao_telemetry_rate_38400;
+				break;
+			}
+			setBaud(rate);
 		} catch (NumberFormatException e) {
 		}
 	}
@@ -481,9 +726,21 @@ public class AltosDroid extends FragmentActivity {
 		Intent serverIntent = null;
 		switch (item.getItemId()) {
 		case R.id.connect_scan:
-			// Launch the DeviceListActivity to see devices and do scan
-			serverIntent = new Intent(this, DeviceListActivity.class);
-			startActivityForResult(serverIntent, REQUEST_CONNECT_DEVICE);
+			if (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
+			 */
+			disconnectDevice();
+			return true;
+		case R.id.quit:
+			Log.d(TAG, "R.id.quit");
+			disconnectDevice();
+			finish();
 			return true;
 		case R.id.select_freq:
 			// Set the TBT radio frequency
@@ -501,16 +758,40 @@ public class AltosDroid extends FragmentActivity {
 				"Channel 9 (435.450MHz)"
 			};
 
-			AlertDialog.Builder builder = new AlertDialog.Builder(this);
-			builder.setTitle("Pick a frequency");
-			builder.setItems(frequencies,
+			AlertDialog.Builder builder_freq = new AlertDialog.Builder(this);
+			builder_freq.setTitle("Pick a frequency");
+			builder_freq.setItems(frequencies,
 					 new DialogInterface.OnClickListener() {
 						 public void onClick(DialogInterface dialog, int item) {
 							 setFrequency(frequencies[item]);
 						 }
 					 });
-			AlertDialog alert = builder.create();
-			alert.show();
+			AlertDialog alert_freq = builder_freq.create();
+			alert_freq.show();
+			return true;
+		case R.id.select_rate:
+			// Set the TBT baud rate
+
+			final String[] rates = {
+				"38400",
+				"9600",
+				"2400",
+			};
+
+			AlertDialog.Builder builder_rate = new AlertDialog.Builder(this);
+			builder_rate.setTitle("Pick a baud rate");
+			builder_rate.setItems(rates,
+					 new DialogInterface.OnClickListener() {
+						 public void onClick(DialogInterface dialog, int item) {
+							 setBaud(rates[item]);
+						 }
+					 });
+			AlertDialog alert_rate = builder_rate.create();
+			alert_rate.show();
+			return true;
+		case R.id.change_units:
+			boolean	imperial = AltosPreferences.imperial_units();
+			AltosPreferences.set_imperial_units(!imperial);
 			return true;
 		}
 		return false;