X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryService.java;h=4701ba1f2c0cf568d6d8e0a2d1d6adac195697f8;hb=162c640d382b9f823573578fe97584adc94cd9b6;hp=e9254badc235994e81b905158a8a4b6a0a3d3b2a;hpb=e121ec3ae634f41979717281a28af5e4a38e8f3a;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index e9254bad..4701ba1f 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;
@@ -36,7 +36,7 @@ import android.os.RemoteException;
 import android.util.Log;
 import android.widget.Toast;
 
-import org.altusmetrum.AltosLib.*;
+//import org.altusmetrum.AltosLib.*;
 
 public class TelemetryService extends Service {
 
@@ -47,6 +47,9 @@ public class TelemetryService extends Service {
 	static final int MSG_UNREGISTER_CLIENT = 2;
 	static final int MSG_CONNECT           = 3;
 	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,8 +68,10 @@ public class TelemetryService extends Service {
 	// Name of the connected device
 	private BluetoothDevice device = null;
 	private AltosBluetooth mAltosBluetooth = 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 {
@@ -80,6 +85,7 @@ 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));
 				} catch (RemoteException e) {
 					s.mClients.remove(msg.replyTo);
@@ -97,9 +103,18 @@ 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();
+				break;
+			case MSG_TELEMETRY:
+				s.sendMessageToClients(Message.obtain(null, AltosDroid.MSG_TELEMETRY, msg.obj));
 				break;
 			default:
 				super.handleMessage(msg);
@@ -120,13 +135,20 @@ public class TelemetryService extends Service {
 	private void stopAltosBluetooth() {
 		if (D) Log.i(TAG, "Stopping BT");
 		setState(STATE_READY);
+		if (mTelemetryReader != null) {
+			mTelemetryReader.interrupt();
+			try {
+				mTelemetryReader.join();
+			} catch (InterruptedException e) {
+			}
+			mTelemetryReader = null;
+		}
 		if (mAltosBluetooth != null) {
 			if (D) Log.i(TAG, "Closing AltosBluetooth");
 			mAltosBluetooth.close();
 			mAltosBluetooth = null;
 		}
 		device = null;
-		telem.clear();
 	}
 
 	private void startAltosBluetooth() {
@@ -147,12 +169,24 @@ public class TelemetryService extends Service {
 		sendMessageToClients(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, state, -1));
 	}
 
+	private void connected() {
+		sendMessageToClients(Message.obtain(null, AltosDroid.MSG_DEVNAME, device.getName()));
+		setState(STATE_CONNECTED);
+		try {
+			sendMessageToClients(Message.obtain(null, AltosDroid.MSG_DEVCONFIG, mAltosBluetooth.config_data()));
+		} catch (InterruptedException e) {
+		} catch (TimeoutException e) {
+		}
+		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);
 	}