altosdroid: Add passing of Device Config at connect

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / TelemetryService.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 3181d1614764edce1ce7fc6b8712bcd4599ba86f..3ae87bb139f8a5c9dfce058fffdf3a354cab0552 100644 (file)
--- 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,7 +27,7 @@ import android.app.PendingIntent;
 import android.app.Service;
 import android.bluetooth.BluetoothDevice;
 import android.content.Intent;
-import android.os.Bundle;
+//import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Handler;
 import android.os.Message;
@@ -36,11 +36,7 @@ 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 {
 
@@ -51,16 +47,15 @@ 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;
        public static final int STATE_CONNECTING = 2;
        public static final int STATE_CONNECTED  = 3;
 
-       // Key names received from the TelemetryService Handler
-       public static final String KEY_DEVNAME = "key_devname";
-       public static final String KEY_TOAST   = "key_toast";
-
        // Unique Identification Number for the Notification.
        // We use it on Notification start, and to cancel it.
        private int NOTIFICATION = R.string.telemetry_service_label;
@@ -71,10 +66,11 @@ public class TelemetryService extends Service {
        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;
+
        private int state = STATE_NONE;
-       LinkedBlockingQueue<AltosLine> telem;
 
        // Handler of incoming messages from clients.
        static class IncomingHandler extends Handler {
@@ -88,6 +84,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);
@@ -100,18 +97,23 @@ public class TelemetryService extends Service {
                                break;
                        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.mConnectedDeviceName = msg.getData().getString(KEY_DEVNAME);
-                               Message m = Message.obtain(null, AltosDroid.MSG_DEVNAME);
-                               Bundle b = new Bundle();
-                               b.putString(AltosDroid.KEY_DEVNAME, s.mConnectedDeviceName);
-                               m.setData(b);
-                               s.sendMessageToClients(m);
-                               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);
@@ -132,22 +134,30 @@ 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;
                }
-               telem.clear();
+               device = null;
        }
 
-       private void startAltosBluetooth(BluetoothDevice d) {
+       private void startAltosBluetooth() {
                if (mAltosBluetooth == null) {
-                       if (D) Log.i(TAG, "Connecting to " + d.getName());
-                       mAltosBluetooth = new AltosBluetooth(d, mHandler);
+                       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, d), 1000);
+                       mHandler.sendMessageDelayed(Message.obtain(null, MSG_CONNECT, device), 1000);
                }
        }
 
@@ -158,12 +168,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);
        }