X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryReader.java;h=0c437f87a7fd3f20513b2dfb9bb197e75622c04c;hp=3ba5afa9a25aa0b3055b2bca87c0224e75952df2;hb=bc3fbcb35090be3856284ccf4d908ebf39d02bec;hpb=0b70ea04e807c69a987d5976ab217f9f65fb1e09

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();
+		}
 	}
 }