X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryService.java;h=d11fc53a8c47df6a6273b526fa4a13322af9425b;hb=c6d667a6ac0decfde5bc8a180b14774e9942dd0c;hp=88ba805cd44fbb1fb2f5ca65c285e847eb014a36;hpb=fa8668931cbbc1506560222f2db7e427b514a351;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 88ba805c..d11fc53a 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -19,7 +19,7 @@ package org.altusmetrum.AltosDroid;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
-import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeoutException;
 
 import android.app.Notification;
 //import android.app.NotificationManager;
@@ -49,6 +49,7 @@ public class TelemetryService extends Service {
 	static final int MSG_CONNECTED         = 4;
 	static final int MSG_CONNECT_FAILED    = 5;
 	static final int MSG_DISCONNECTED      = 6;
+	static final int MSG_TELEMETRY         = 7;
 
 	public static final int STATE_NONE       = 0;
 	public static final int STATE_READY      = 1;
@@ -65,10 +66,13 @@ public class TelemetryService extends Service {
 	final Messenger mMessenger = new Messenger(mHandler); // Target we publish for clients to send messages to IncomingHandler.
 
 	// Name of the connected device
-	private BluetoothDevice device = null;
-	private AltosBluetooth mAltosBluetooth = null;
+	private BluetoothDevice device           = null;
+	private AltosBluetooth  mAltosBluetooth  = null;
+	private AltosConfigData mConfigData      = null;
+	private TelemetryReader mTelemetryReader = null;
+
+	// internally track state of bluetooth connection
 	private int state = STATE_NONE;
-	LinkedBlockingQueue<AltosLine> telem;
 
 	// Handler of incoming messages from clients.
 	static class IncomingHandler extends Handler {
@@ -82,8 +86,9 @@ public class TelemetryService extends Service {
 			case MSG_REGISTER_CLIENT:
 				s.mClients.add(msg.replyTo);
 				try {
-					msg.replyTo.send(Message.obtain(null, AltosDroid.MSG_DEVNAME, s.device.getName()));
-					msg.replyTo.send(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, s.state, -1));
+					// Now we try to send the freshly connected UI any relavant information about what
+					// we're talking to - Basically state and Config Data.
+					msg.replyTo.send(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, s.state, -1, s.mConfigData));
 				} catch (RemoteException e) {
 					s.mClients.remove(msg.replyTo);
 				}
@@ -100,17 +105,21 @@ public class TelemetryService extends Service {
 				break;
 			case MSG_CONNECTED:
 				if (D) Log.d(TAG, "Connected to device");
-				s.sendMessageToClients(Message.obtain(null, AltosDroid.MSG_DEVNAME, s.device.getName()));
-				s.setState(STATE_CONNECTED);
-				s.mAltosBluetooth.add_monitor(s.telem);
+				s.connected();
 				break;
 			case MSG_CONNECT_FAILED:
 				if (D) Log.d(TAG, "Connection failed... retrying");
 				s.startAltosBluetooth();
 				break;
 			case MSG_DISCONNECTED:
-				if (D) Log.d(TAG, "Disconnected from " + s.device.getName());
-				s.stopAltosBluetooth();
+				// Only do the following if we haven't been shutdown elsewhere..
+				if (s.device != null) {
+					if (D) Log.d(TAG, "Disconnected from " + s.device.getName());
+					s.stopAltosBluetooth();
+				}
+				break;
+			case MSG_TELEMETRY:
+				s.sendMessageToClients(Message.obtain(null, AltosDroid.MSG_TELEMETRY, msg.obj));
 				break;
 			default:
 				super.handleMessage(msg);
@@ -129,41 +138,77 @@ public class TelemetryService extends Service {
 	}
 
 	private void stopAltosBluetooth() {
-		if (D) Log.i(TAG, "Stopping BT");
+		if (D) Log.d(TAG, "stopAltosBluetooth(): begin");
 		setState(STATE_READY);
+		if (mTelemetryReader != null) {
+			if (D) Log.d(TAG, "stopAltosBluetooth(): stopping TelemetryReader");
+			mTelemetryReader.interrupt();
+			try {
+				mTelemetryReader.join();
+			} catch (InterruptedException e) {
+			}
+			mTelemetryReader = null;
+		}
 		if (mAltosBluetooth != null) {
-			if (D) Log.i(TAG, "Closing AltosBluetooth");
+			if (D) Log.d(TAG, "stopAltosBluetooth(): stopping AltosBluetooth");
 			mAltosBluetooth.close();
 			mAltosBluetooth = null;
 		}
 		device = null;
-		telem.clear();
+		mConfigData = null;
 	}
 
 	private void startAltosBluetooth() {
 		if (mAltosBluetooth == null) {
-			if (D) Log.i(TAG, "Connecting to " + device.getName());
+			if (D) Log.d(TAG, String.format("startAltosBluetooth(): Connecting to %s (%s)", device.getName(), device.getAddress()));
 			mAltosBluetooth = new AltosBluetooth(device, mHandler);
 			setState(STATE_CONNECTING);
 		} else {
+			// This is a bit of a hack - if it appears we're still connected, we treat this as a restart.
+			// So, to give a suitable delay to teardown/bringup, we just schedule a resend of a message
+			// to ourselves in a few seconds time that will ultimately call this method again.
+			// ... then we tear down the existing connection.
+			// We do it this way around so that we don't lose a reference to the device when this method
+			// is called on reception of MSG_CONNECT_FAILED in the handler above.
+			mHandler.sendMessageDelayed(Message.obtain(null, MSG_CONNECT, device), 3000);
 			stopAltosBluetooth();
-			mHandler.sendMessageDelayed(Message.obtain(null, MSG_CONNECT, device), 1000);
 		}
 	}
 
 	private synchronized void setState(int s) {
-		if (D) Log.d(TAG, "setState() " + state + " -> " + s);
+		if (D) Log.d(TAG, "setState(): " + state + " -> " + s);
 		state = s;
 
-		sendMessageToClients(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, state, -1));
+		// This shouldn't be required - mConfigData should be null for any non-connected
+		// state, but to be safe and to reduce message size
+		AltosConfigData acd = (state == STATE_CONNECTED) ? mConfigData : null;
+
+		sendMessageToClients(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, state, -1, acd));
 	}
 
+	private void connected() {
+		try {
+			mConfigData = mAltosBluetooth.config_data();
+		} catch (InterruptedException e) {
+		} catch (TimeoutException e) {
+			// If this timed out, then we really want to retry it, but
+			// probably safer to just retry the connection from scratch.
+			mHandler.obtainMessage(MSG_CONNECT_FAILED).sendToTarget();
+			return;
+		}
+
+		setState(STATE_CONNECTED);
+
+		mTelemetryReader = new TelemetryReader(mAltosBluetooth, mHandler);
+		mTelemetryReader.start();
+	}
+
+
 	@Override
 	public void onCreate() {
 		// Create a reference to the NotificationManager so that we can update our notifcation text later
 		//mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
 
-		telem = new LinkedBlockingQueue<AltosLine>();
 		setState(STATE_READY);
 	}