Switch from GPLv2 to GPLv2+

[fw/altos] / altoslib / AltosTelemetryReader.java

diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index 5e28358762c72e9ca51f013efa782ae5742529db..6a93c2c3f262ad5bce24b5fe0dde0f028be0fff4 100644 (file)
--- a/altoslib/AltosTelemetryReader.java
+++ b/altoslib/AltosTelemetryReader.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_11;
 
 import java.text.*;
 import java.io.*;
@@ -26,14 +27,18 @@ public class AltosTelemetryReader extends AltosFlightReader {
        AltosLog        log;
        double          frequency;
        int             telemetry;
+       int             telemetry_rate;
        AltosState      state = null;
 
        LinkedBlockingQueue<AltosLine> telem;
 
        public AltosState read() throws InterruptedException, ParseException, AltosCRCException, IOException {
-               AltosLine l = telem.take();
-               if (l.line == null)
-                       throw new IOException("IO error");
+               AltosLine l;
+               do {
+                       l = telem.take();
+                       if (l.line == null)
+                               throw new IOException("IO error");
+               } while (!link.get_monitor());
                AltosTelemetry  telem = AltosTelemetry.parse(l.line);
                if (state == null)
                        state = new AltosState();
@@ -49,9 +54,11 @@ public class AltosTelemetryReader extends AltosFlightReader {
 
        public void reset() {
                flush();
+               state = null;
        }
 
        public void close(boolean interrupted) {
+
                link.remove_monitor(telem);
                log.close();
                try {
@@ -92,6 +99,23 @@ public class AltosTelemetryReader extends AltosFlightReader {
                }
        }
 
+       public boolean supports_telemetry_rate(int telemetry_rate) {
+               try {
+                       /* Version 1.4.1.1 supports all rates, older versions don't */
+                       if (link.config_data().compare_version("1.4.1.1") >= 0)
+                               return true;
+
+                       if (telemetry_rate == AltosLib.ao_telemetry_rate_38400)
+                               return true;
+                       else
+                               return false;
+               } catch (InterruptedException ie) {
+                       return false;
+               } catch (TimeoutException te) {
+                       return true;
+               }
+       }
+
        public void save_frequency() {
                AltosPreferences.set_frequency(link.serial, frequency);
        }
@@ -105,6 +129,15 @@ public class AltosTelemetryReader extends AltosFlightReader {
                AltosPreferences.set_telemetry(link.serial, telemetry);
        }
 
+       public void set_telemetry_rate(int in_telemetry_rate) {
+               telemetry_rate = in_telemetry_rate;
+               link.set_telemetry_rate(telemetry_rate);
+       }
+
+       public void save_telemetry_rate() {
+               AltosPreferences.set_telemetry_rate(link.serial, telemetry_rate);
+       }
+
        public void set_monitor(boolean monitor) {
                link.set_monitor(monitor);
        }
@@ -133,6 +166,8 @@ public class AltosTelemetryReader extends AltosFlightReader {
                        set_frequency(frequency);
                        telemetry = AltosPreferences.telemetry(link.serial);
                        set_telemetry(telemetry);
+                       telemetry_rate = AltosPreferences.telemetry_rate(link.serial);
+                       set_telemetry_rate(telemetry_rate);
                        link.add_monitor(telem);
                        success = true;
                } finally {