X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryService.java;h=cd47c6f9587b0e833b9d7a455327a7860f819603;hb=5ce8c63850dbc6462d7c41ce917e0e06672ec0ab;hp=9c2fde97b778dc434a8e060f1d2f9a048a634710;hpb=31bffa435cec2098c7ab5c42c829ba6e1578b5d2;p=fw%2Faltos diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java index 9c2fde97..cd47c6f9 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 { @@ -49,6 +47,9 @@ 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; @@ -65,10 +66,12 @@ 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 AltosBluetooth mAltosBluetooth = null; + private BluetoothDevice device = null; + private AltosBluetooth mAltosBluetooth = null; + private TelemetryReader mTelemetryReader = null; + + // internally track state of bluetooth connection private int state = STATE_NONE; - LinkedBlockingQueue telem; // Handler of incoming messages from clients. static class IncomingHandler extends Handler { @@ -81,6 +84,12 @@ 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: @@ -89,12 +98,26 @@ 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.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: + // Only do the following if we haven't been shutdown elsewhere.. + if (s.device != null) { + 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); @@ -113,32 +136,67 @@ public class TelemetryService extends Service { } private void stopAltosBluetooth() { + if (D) Log.d(TAG, "stopAltosBluetooth(): begin"); setState(STATE_READY); + if (mTelemetryReader != null) { + if (D) Log.d(TAG, "stopAltosBluetooth(): stopping TelemetryReader"); + mTelemetryReader.interrupt(); + try { + mTelemetryReader.join(); + } catch (InterruptedException e) { + } + mTelemetryReader = null; + } if (mAltosBluetooth != null) { + if (D) Log.d(TAG, "stopAltosBluetooth(): stopping AltosBluetooth"); mAltosBluetooth.close(); mAltosBluetooth = null; } - telem.clear(); + device = null; } - private void startAltosBluetooth(BluetoothDevice d) { - mAltosBluetooth = new AltosBluetooth(d, mHandler); + private void startAltosBluetooth() { + if (mAltosBluetooth == null) { + if (D) Log.d(TAG, String.format("startAltosBluetooth(): Connecting to %s (%s)", device.getName(), device.getAddress())); + mAltosBluetooth = new AltosBluetooth(device, mHandler); setState(STATE_CONNECTING); + } else { + // This is a bit of a hack - if it appears we're still connected, we treat this as a restart. + // So, to give a suitable delay to teardown/bringup, we just schedule a resend of a message + // to ourselves in a few seconds time that will ultimately call this method again. + // ... then we tear down the existing connection. + // We do it this way around so that we don't lose a reference to the device when this method + // is called on reception of MSG_CONNECT_FAILED in the handler above. + mHandler.sendMessageDelayed(Message.obtain(null, MSG_CONNECT, device), 3000); + stopAltosBluetooth(); + } } private synchronized void setState(int s) { - if (D) Log.d(TAG, "setState() " + state + " -> " + s); + if (D) Log.d(TAG, "setState(): " + state + " -> " + s); state = s; 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(); setState(STATE_READY); }