Merge branch 'master' into new-state

[fw/altos] / altoslib / AltosTelemetryReader.java

diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index bdb44eefb369edb940027aec7bd38fe191a8e22c..b1cc009c12814f336bf56b9b3d86be1a460fc4ef 100644 (file)
--- a/altoslib/AltosTelemetryReader.java
+++ b/altoslib/AltosTelemetryReader.java
@@ -15,9 +15,8 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_1;
 
-import java.lang.*;
 import java.text.*;
 import java.io.*;
 import java.util.concurrent.*;
@@ -28,16 +27,21 @@ public class AltosTelemetryReader extends AltosFlightReader {
        AltosRecord     previous;
        double          frequency;
        int             telemetry;
+       AltosState      state = null;
 
        LinkedBlockingQueue<AltosLine> telem;
 
-       public AltosRecord read() throws InterruptedException, ParseException, AltosCRCException, IOException {
+       public AltosState read() throws InterruptedException, ParseException, AltosCRCException, IOException {
                AltosLine l = telem.take();
                if (l.line == null)
                        throw new IOException("IO error");
-               AltosRecord     next = AltosTelemetry.parse(l.line, previous);
-               previous = next;
-               return next;
+               AltosTelemetry  telem = AltosTelemetryLegacy.parse(l.line);
+               if (state == null)
+                       state = new AltosState();
+               else
+                       state = state.clone();
+               telem.update_state(state);
+               return state;
        }
 
        public void flush() {
@@ -108,6 +112,14 @@ public class AltosTelemetryReader extends AltosFlightReader {
                return log.file();
        }
 
+       public boolean has_monitor_battery() {
+               return link.has_monitor_battery();
+       }
+
+       public double monitor_battery() {
+               return link.monitor_battery();
+       }
+
        public AltosTelemetryReader (AltosLink in_link)
                throws IOException, InterruptedException, TimeoutException {
                link = in_link;