summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Beattie <mike@ethernal.org>2012-08-26 15:28:09 +1200
committerMike Beattie <mike@ethernal.org>2012-08-26 15:28:09 +1200
commit6ffcc82d8d18d3f05d4f5881e50dda298b43c114 (patch)
tree7e5d103d36238582d70078d5b0a63c42df851ad2
parenta33333b97e810f50db36f345aab71a3200feccc3 (diff)
altosdroid: begin adding IPC to TelemetryService
* And add imports for LinkedBlockingQueue... oops! Signed-off-by: Mike Beattie <mike@ethernal.org>
-rw-r--r--altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java53
1 files changed, 53 insertions, 0 deletions
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 15293b9e..337aece1 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -17,13 +17,20 @@
package org.altusmetrum.AltosDroid;
+import java.util.ArrayList;
+import java.util.concurrent.LinkedBlockingQueue;
+
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.app.Service;
+import android.bluetooth.BluetoothDevice;
import android.content.Intent;
//import android.os.Binder;
import android.os.IBinder;
+import android.os.Handler;
+import android.os.Message;
+import android.os.Messenger;
import android.util.Log;
import android.widget.Toast;
@@ -38,11 +45,17 @@ public class TelemetryService extends Service {
private static final String TAG = "TelemetryService";
private static final boolean D = true;
+ static final int MSG_REGISTER_CLIENT = 1;
+ static final int MSG_UNREGISTER_CLIENT = 2;
+ static final int MSG_CONNECT_TELEBT = 3;
+
// 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;
+ 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.
// Name of the connected device
private String mConnectedDeviceName = null;
@@ -50,6 +63,43 @@ public class TelemetryService extends Service {
LinkedBlockingQueue<AltosLine> telem;
+ // Handler of incoming messages from clients.
+ class IncomingHandler extends Handler {
+ @Override
+ public void handleMessage(Message msg) {
+ switch (msg.what) {
+ case MSG_REGISTER_CLIENT:
+ mClients.add(msg.replyTo);
+ if (D) Log.d(TAG, "Client bound to service");
+ break;
+ case MSG_UNREGISTER_CLIENT:
+ mClients.remove(msg.replyTo);
+ if (D) Log.d(TAG, "Client unbound from service");
+ break;
+ case MSG_CONNECT_TELEBT:
+ if (D) Log.d(TAG, "Connect command received");
+ TeleBT_stop();
+ TeleBT_start((BluetoothDevice) msg.obj);
+ break;
+ default:
+ super.handleMessage(msg);
+ }
+ }
+ }
+
+ private void TeleBT_stop() {
+ if (mAltosBluetooth != null) {
+ mAltosBluetooth.close();
+ mAltosBluetooth = null;
+ }
+ telem.clear();
+ }
+
+ private void TeleBT_start(BluetoothDevice d) {
+ mAltosBluetooth = new AltosBluetooth(d);
+ mAltosBluetooth.add_monitor(telem);
+ }
+
@Override
public void onCreate() {
// Create a reference to the NotificationManager so that we can update our notifcation text later
@@ -86,6 +136,8 @@ public class TelemetryService extends Service {
@Override
public void onDestroy() {
+ // Stop the bluetooth Comms threads
+ TeleBT_stop();
// Demote us from the foreground, and cancel the persistent notification.
stopForeground(true);
@@ -96,6 +148,7 @@ public class TelemetryService extends Service {
@Override
public IBinder onBind(Intent intent) {
+ return mMessenger.getBinder();
}