X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryService.java;h=3ae87bb139f8a5c9dfce058fffdf3a354cab0552;hb=ae03d8e87985b9f746e9e22b2394a0a5b4f39f1c;hp=60500a2c44f813e4ff32273aecc3bcbcff4b833e;hpb=21359f600354e8ee840e839e61ef97d30f3586fc;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 60500a2c..3ae87bb1 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;
@@ -27,18 +27,16 @@ import android.app.PendingIntent;
 import android.app.Service;
 import android.bluetooth.BluetoothDevice;
 import android.content.Intent;
+//import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
+import android.os.RemoteException;
 import android.util.Log;
 import android.widget.Toast;
 
-// Need the following import to get access to the app resources, since this
-// class is in a sub-package.
-//import org.altusmetrum.AltosDroid.R;
-
-import org.altusmetrum.AltosLib.*;
+//import org.altusmetrum.AltosLib.*;
 
 public class TelemetryService extends Service {
 
@@ -47,7 +45,11 @@ public class TelemetryService extends Service {
 
 	static final int MSG_REGISTER_CLIENT   = 1;
 	static final int MSG_UNREGISTER_CLIENT = 2;
-	static final int MSG_CONNECT_TELEBT    = 3;
+	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;
@@ -60,13 +62,15 @@ public class TelemetryService extends Service {
 	//private NotificationManager mNM;
 
 	ArrayList<Messenger> mClients = new ArrayList<Messenger>(); // Keeps track of all current registered clients.
-	final Messenger mMessenger = new Messenger(new IncomingHandler()); // Target we publish for clients to send messages to IncomingHandler.
+	final Handler   mHandler   = new IncomingHandler(this);
+	final Messenger mMessenger = new Messenger(mHandler); // Target we publish for clients to send messages to IncomingHandler.
 
 	// Name of the connected device
-	private String mConnectedDeviceName = null;
+	private BluetoothDevice device = null;
 	private AltosBluetooth mAltosBluetooth = null;
+	private TelemetryReader mTelemetryReader = null;
 
-	LinkedBlockingQueue<AltosLine> telem;
+	private int state = STATE_NONE;
 
 	// Handler of incoming messages from clients.
 	static class IncomingHandler extends Handler {
@@ -79,15 +83,37 @@ public class TelemetryService extends Service {
 			switch (msg.what) {
 			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);
+				}
 				if (D) Log.d(TAG, "Client bound to service");
 				break;
 			case MSG_UNREGISTER_CLIENT:
 				s.mClients.remove(msg.replyTo);
 				if (D) Log.d(TAG, "Client unbound from service");
 				break;
-			case MSG_CONNECT_TELEBT:
+			case MSG_CONNECT:
 				if (D) Log.d(TAG, "Connect command received");
-				s.startAltosBluetooth((BluetoothDevice) msg.obj);
+				s.device = (BluetoothDevice) msg.obj;
+				s.startAltosBluetooth();
+				break;
+			case MSG_CONNECTED:
+				if (D) Log.d(TAG, "Connected to device");
+				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);
@@ -95,23 +121,72 @@ public class TelemetryService extends Service {
 		}
 	}
 
+	private void sendMessageToClients(Message m) {
+		for (int i=mClients.size()-1; i>=0; i--) {
+			try {
+				mClients.get(i).send(m);
+			} catch (RemoteException e) {
+				mClients.remove(i);
+			}
+		}
+	}
+
 	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;
 		}
-		telem.clear();
+		device = null;
+	}
+
+	private void startAltosBluetooth() {
+		if (mAltosBluetooth == null) {
+			if (D) Log.i(TAG, "Connecting to " + device.getName());
+			mAltosBluetooth = new AltosBluetooth(device, mHandler);
+			setState(STATE_CONNECTING);
+		} else {
+			stopAltosBluetooth();
+			mHandler.sendMessageDelayed(Message.obtain(null, MSG_CONNECT, device), 1000);
+		}
+	}
+
+	private synchronized void setState(int s) {
+		if (D) Log.d(TAG, "setState() " + state + " -> " + s);
+		state = s;
+
+		sendMessageToClients(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, state, -1));
 	}
 
-	private void startAltosBluetooth(BluetoothDevice d) {
-		mAltosBluetooth = new AltosBluetooth(d);
-		mAltosBluetooth.add_monitor(telem);
+	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);
+
+		setState(STATE_READY);
 	}
 
 	@Override