X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryReader.java;h=aea978445578e536b3daf3a5b1ffc73ffaf3675d;hb=f9bbca59a9034cf7e6df4577e627d7447f3a9d51;hp=112e008efff4bd75eb0147f9e3d02eb1d42570a3;hpb=f86dac643081987c8994ab57a96640d5e91b342a;p=fw%2Faltos

diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index 112e008e..aea97844 100644
--- 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_2;
 
-import java.lang.*;
 import java.text.*;
 import java.io.*;
 import java.util.concurrent.*;
@@ -25,25 +24,33 @@ import java.util.concurrent.*;
 public class AltosTelemetryReader extends AltosFlightReader {
 	AltosLink	link;
 	AltosLog	log;
-	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 = AltosTelemetry.parse(l.line);
+		if (state == null)
+			state = new AltosState();
+		else
+			state = state.clone();
+		telem.update_state(state);
+		return state;
 	}
 
 	public void flush() {
 		telem.clear();
 	}
 
+	public void reset() {
+		flush();
+	}
+
 	public void close(boolean interrupted) {
 		link.remove_monitor(telem);
 		log.close();
@@ -103,17 +110,32 @@ 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;
-		log = new AltosLog(link);
-		name = link.name;
-		previous = null;
-		telem = new LinkedBlockingQueue<AltosLine>();
-		frequency = AltosPreferences.frequency(link.serial);
-		set_frequency(frequency);
-		telemetry = AltosPreferences.telemetry(link.serial);
-		set_telemetry(telemetry);
-		link.add_monitor(telem);
+		try {
+			log = new AltosLog(link);
+			name = link.name;
+			telem = new LinkedBlockingQueue<AltosLine>();
+			frequency = AltosPreferences.frequency(link.serial);
+			set_frequency(frequency);
+			telemetry = AltosPreferences.telemetry(link.serial);
+			set_telemetry(telemetry);
+			link.add_monitor(telem);
+		} catch (TimeoutException e) {
+			close(true);
+			throw(e);
+		} catch (InterruptedException e) {
+			close(true);
+			throw(e);
+		}
 	}
 }