altosdroid: Add USB support for TeleDongle/TeleBT

[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 2a2cc4040de33ead81269752adbd99716a559e4a..bdb2bae441e078c8bd03ebe57a307a3b7f4d850b 100644 (file)
--- 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_3.*;
+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,7 +67,8 @@ public class TelemetryReader extends Thread {
                AltosState  state = null;
 
                try {
-                       for (;;) {
+                       if (D) Log.d(TAG, "starting loop");
+                       while (telemQueue != null) {
                                try {
                                        state = read();
                                        handler.obtainMessage(TelemetryService.MSG_TELEMETRY, state).sendToTarget();
@@ -79,17 +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);
+               link.set_telemetry(AltosLib.ao_telemetry_standard);
+
+               if (D) Log.d(TAG, "connected TelemetryReader created");
        }
 }