X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryService.java;h=cf7ae6da452a312dd095d7810ca052b2877db7a8;hb=2c5513c51b187ad26a59b193b401f38c35141d27;hp=1c0e94b3855ab2e7172dbb623e5272bff935c6b9;hpb=54baecc208a40606e3242b2cbd5e66567053646f;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 1c0e94b3..cf7ae6da 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.concurrent.LinkedBlockingQueue;
 
 import android.app.Notification;
-import android.app.NotificationManager;
+//import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.bluetooth.BluetoothDevice;
@@ -47,7 +47,8 @@ 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;
 
 	public static final int STATE_NONE       = 0;
 	public static final int STATE_READY      = 1;
@@ -57,7 +58,7 @@ public class TelemetryService extends Service {
 	// Unique Identification Number for the Notification.
 	// We use it on Notification start, and to cancel it.
 	private int NOTIFICATION = R.string.telemetry_service_label;
-	private NotificationManager mNM;
+	//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.
@@ -85,10 +86,13 @@ public class TelemetryService extends Service {
 				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);
 				break;
+			case MSG_CONNECTED:
+				if (D) Log.d(TAG, "Connected to device");
+				break;
 			default:
 				super.handleMessage(msg);
 			}
@@ -111,7 +115,9 @@ public class TelemetryService extends Service {
 	@Override
 	public void onCreate() {
 		// Create a reference to the NotificationManager so that we can update our notifcation text later
-		mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
+		//mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
+
+		telem = new LinkedBlockingQueue<AltosLine>();
 	}
 
 	@Override