altosdroid: Add quit. Restart. Show freq in title.

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / TelemetryReader.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
index 3ba5afa9a25aa0b3055b2bca87c0224e75952df2..0c437f87a7fd3f20513b2dfb9bb197e75622c04c 100644 (file)
--- 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();
+               }
        }
 }