altosdroid: Save AltosState and restore at startup

[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 0c437f87a7fd3f20513b2dfb9bb197e75622c04c..03abeec6d8bb3fe4e5888902b9d20c34be396f70 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
@@ -31,6 +31,7 @@ import org.altusmetrum.altoslib_5.*;
 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();
@@ -84,21 +86,16 @@ public class TelemetryReader extends Thread {
                }
        }
 
-       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");
        }
 }