summaryrefslogtreecommitdiff
path: root/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2014-08-31 00:08:33 -0500
committerKeith Packard <keithp@keithp.com>2014-08-31 00:08:33 -0500
commitbc3fbcb35090be3856284ccf4d908ebf39d02bec (patch)
tree7cb5bada48a2bfc1b79cfda3b50d72c5c797fd9e /altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
parent0b70ea04e807c69a987d5976ab217f9f65fb1e09 (diff)
altosdroid: Add quit. Restart. Show freq in title.
Add a quit button to menu. When restarting, reconnect to previous device. When connecting, set the freq/rate to previous values. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java')
-rw-r--r--altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
index 3ba5afa9..0c437f87 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
@@ -66,7 +66,7 @@ public class TelemetryReader extends Thread {
AltosState state = null;
try {
- for (;;) {
+ while (telemQueue != null) {
try {
state = read();
handler.obtainMessage(TelemetryService.MSG_TELEMETRY, state).sendToTarget();
@@ -91,5 +91,14 @@ public class TelemetryReader extends Thread {
state = null;
telemQueue = new LinkedBlockingQueue<AltosLine>();
link.add_monitor(telemQueue);
+ try {
+ link.set_radio_frequency(AltosPreferences.frequency(link.serial));
+ link.set_telemetry(AltosLib.ao_telemetry_standard);
+ link.set_telemetry_rate(AltosPreferences.telemetry_rate(link.serial));
+ } catch (InterruptedException ee) {
+ close();
+ } catch (TimeoutException te) {
+ close();
+ }
}
}