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 e9254badc235994e81b905158a8a4b6a0a3d3b2a..a1b1915a9fefd4b08d9cf248238ecc7e166fd28c 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@
-47,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;
@@
-80,6
+82,7
@@
public class TelemetryService extends Service {
case MSG_REGISTER_CLIENT:
s.mClients.add(msg.replyTo);
try {
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);
msg.replyTo.send(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, s.state, -1));
} catch (RemoteException e) {
s.mClients.remove(msg.replyTo);
@@
-97,10
+100,17
@@
public class TelemetryService extends Service {
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.sendMessageToClients(Message.obtain(null, AltosDroid.MSG_DEVNAME, s.device.getName()));
- 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);
}
@@
-147,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