X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryReader.java;h=b1cc009c12814f336bf56b9b3d86be1a460fc4ef;hb=70e67925cff98984d49fbc3f60e880c91e6d5079;hp=7139644edda8e9af37d521c9620ece8277321cfc;hpb=5a3c5de6657d1c26e52015a8acec0cd05e294cef;p=fw%2Faltos

diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index 7139644e..b1cc009c 100644
--- a/altoslib/AltosTelemetryReader.java
+++ b/altoslib/AltosTelemetryReader.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib;
+package org.altusmetrum.altoslib_1;
 
 import java.text.*;
 import java.io.*;
@@ -27,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() {
@@ -107,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;