projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: create connected() method
[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 a61a1eda6b620f7988c4636c6f57c7dbca8cc281..a1b1915a9fefd4b08d9cf248238ecc7e166fd28c 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@
-27,17
+27,15
@@
import android.app.PendingIntent;
import android.app.Service;
import android.bluetooth.BluetoothDevice;
import android.content.Intent;
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.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;
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.*;
public class TelemetryService extends Service {
import org.altusmetrum.AltosLib.*;
public class TelemetryService extends Service {
@@
-49,6
+47,8
@@
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_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;
public static final int STATE_NONE = 0;
public static final int STATE_READY = 1;
public static final int STATE_NONE = 0;
public static final int STATE_READY = 1;
@@
-65,7
+65,7
@@
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
final Messenger mMessenger = new Messenger(mHandler); // Target we publish for clients to send messages to IncomingHandler.
// Name of the connected device
- private
String mConnectedDeviceNam
e = null;
+ private
BluetoothDevice devic
e = null;
private AltosBluetooth mAltosBluetooth = null;
private int state = STATE_NONE;
LinkedBlockingQueue<AltosLine> telem;
private AltosBluetooth mAltosBluetooth = null;
private int state = STATE_NONE;
LinkedBlockingQueue<AltosLine> telem;
@@
-81,6
+81,12
@@
public class TelemetryService extends Service {
switch (msg.what) {
case MSG_REGISTER_CLIENT:
s.mClients.add(msg.replyTo);
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:
if (D) Log.d(TAG, "Client bound to service");
break;
case MSG_UNREGISTER_CLIENT:
@@
-89,13
+95,22
@@
public class TelemetryService extends Service {
break;
case MSG_CONNECT:
if (D) Log.d(TAG, "Connect command received");
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");
break;
case MSG_CONNECTED:
if (D) Log.d(TAG, "Connected to device");
- s.
setState(STATE_CONNECTED
);
+ s.
connected(
);
s.mAltosBluetooth.add_monitor(s.telem);
break;
s.mAltosBluetooth.add_monitor(s.telem);
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;
default:
super.handleMessage(msg);
}
default:
super.handleMessage(msg);
}
@@
-120,13
+135,19
@@
public class TelemetryService extends Service {
mAltosBluetooth.close();
mAltosBluetooth = null;
}
mAltosBluetooth.close();
mAltosBluetooth = null;
}
+ device = null;
telem.clear();
}
telem.clear();
}
- private void startAltosBluetooth(BluetoothDevice d) {
- if (D) Log.i(TAG, "Connecting to " + d.getName());
- mAltosBluetooth = new AltosBluetooth(d, mHandler);
+ private void startAltosBluetooth() {
+ if (mAltosBluetooth == null) {
+ if (D) Log.i(TAG, "Connecting to " + device.getName());
+ mAltosBluetooth = new AltosBluetooth(device, mHandler);
setState(STATE_CONNECTING);
setState(STATE_CONNECTING);
+ } else {
+ stopAltosBluetooth();
+ mHandler.sendMessageDelayed(Message.obtain(null, MSG_CONNECT, device), 1000);
+ }
}
private synchronized void setState(int s) {
}
private synchronized void setState(int s) {
@@
-136,6
+157,12
@@
public class TelemetryService extends Service {
sendMessageToClients(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, state, -1));
}
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);
+ }
+
+
@Override
public void onCreate() {
// Create a reference to the NotificationManager so that we can update our notifcation text later
@Override
public void onCreate() {
// Create a reference to the NotificationManager so that we can update our notifcation text later