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

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
index 0c437f87..bdb2bae4 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
@@ -25,12 +25,13 @@ import java.util.concurrent.*;
 import android.util.Log;
 import android.os.Handler;
 
-import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altoslib_6.*;
 
 
 public class TelemetryReader extends Thread {
 
 	private static final String TAG = "TelemetryReader";
+	private static final boolean D = true;
 
 	int         crc_errors;
 
@@ -66,6 +67,7 @@ public class TelemetryReader extends Thread {
 		AltosState  state = null;
 
 		try {
+			if (D) Log.d(TAG, "starting loop");
 			while (telemQueue != null) {
 				try {
 					state = read();
@@ -79,26 +81,23 @@ public class TelemetryReader extends Thread {
 			}
 		} catch (InterruptedException ee) {
 		} catch (IOException ie) {
+			Log.e(TAG, "IO exception in telemetry reader");
+			handler.obtainMessage(TelemetryService.MSG_DISCONNECTED, link).sendToTarget();
 		} finally {
 			close();
 		}
 	}
 
-	public TelemetryReader (AltosLink in_link, Handler in_handler) {
+	public TelemetryReader (AltosLink in_link, Handler in_handler, AltosState in_state) {
+		if (D) Log.d(TAG, "connected TelemetryReader create started");
 		link    = in_link;
 		handler = in_handler;
 
-		state = null;
+		state = in_state;
 		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();
-		}
+		link.set_telemetry(AltosLib.ao_telemetry_standard);
+
+		if (D) Log.d(TAG, "connected TelemetryReader created");
 	}
 }