X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryService.java;h=42198b6ba7c4d759df8fda1f52f86ccee1df7ac9;hb=03563c765d8b0ab3689c91b2b533c68e11650577;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..42198b6b 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -19,7 +19,6 @@ package org.altusmetrum.AltosDroid;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
-import java.util.concurrent.LinkedBlockingQueue;
 
 import android.app.Notification;
 //import android.app.NotificationManager;
@@ -36,7 +35,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 {
 
@@ -49,6 +48,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;
@@ -67,8 +67,9 @@ public class TelemetryService extends Service {
 	// Name of the connected device
 	private BluetoothDevice device = null;
 	private AltosBluetooth mAltosBluetooth = null;
+	private TelemetryReader mTelemetryReader = null;
+
 	private int state = STATE_NONE;
-	LinkedBlockingQueue<AltosLine> telem;
 
 	// Handler of incoming messages from clients.
 	static class IncomingHandler extends Handler {
@@ -100,9 +101,7 @@ 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");
@@ -112,6 +111,9 @@ public class TelemetryService extends Service {
 				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);
 			}
@@ -131,13 +133,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() {
@@ -158,12 +167,19 @@ 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);
+		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);
 	}