projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: lots of debugging statements
[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 6a23dca32a6ab264ad922f69432dfa963775c0cc..a61a1eda6b620f7988c4636c6f57c7dbca8cc281 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@
-61,7
+61,8
@@
public class TelemetryService extends Service {
//private NotificationManager mNM;
ArrayList<Messenger> mClients = new ArrayList<Messenger>(); // Keeps track of all current registered clients.
//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.
+ final Handler mHandler = new IncomingHandler(this);
+ 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;
// Name of the connected device
private String mConnectedDeviceName = null;
@@
-93,6
+94,7
@@
public class TelemetryService extends Service {
case MSG_CONNECTED:
if (D) Log.d(TAG, "Connected to device");
s.setState(STATE_CONNECTED);
case MSG_CONNECTED:
if (D) Log.d(TAG, "Connected to device");
s.setState(STATE_CONNECTED);
+ s.mAltosBluetooth.add_monitor(s.telem);
break;
default:
super.handleMessage(msg);
break;
default:
super.handleMessage(msg);
@@
-100,9
+102,21
@@
public class TelemetryService extends Service {
}
}
}
}
+ private void sendMessageToClients(Message m) {
+ for (int i=mClients.size()-1; i>=0; i--) {
+ try {
+ mClients.get(i).send(m);
+ } catch (RemoteException e) {
+ mClients.remove(i);
+ }
+ }
+ }
+
private void stopAltosBluetooth() {
private void stopAltosBluetooth() {
+ if (D) Log.i(TAG, "Stopping BT");
setState(STATE_READY);
if (mAltosBluetooth != null) {
setState(STATE_READY);
if (mAltosBluetooth != null) {
+ if (D) Log.i(TAG, "Closing AltosBluetooth");
mAltosBluetooth.close();
mAltosBluetooth = null;
}
mAltosBluetooth.close();
mAltosBluetooth = null;
}
@@
-110,8
+124,8
@@
public class TelemetryService extends Service {
}
private void startAltosBluetooth(BluetoothDevice d) {
}
private void startAltosBluetooth(BluetoothDevice d) {
-
mAltosBluetooth = new AltosBluetooth(d
);
-
mAltosBluetooth.add_monitor(telem
);
+
if (D) Log.i(TAG, "Connecting to " + d.getName()
);
+
mAltosBluetooth = new AltosBluetooth(d, mHandler
);
setState(STATE_CONNECTING);
}
setState(STATE_CONNECTING);
}