X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryReader.java;h=b4293c7349d2d9fda70bd03942aa91c37e0ac031;hb=cef4e3ee95037050ae859fb2fdc0a57373764bd8;hp=67ac1b6518cfb94f60765c2b9c3b94a86b403015;hpb=69e6df07976a56b49e07c242cd6e5b2cbd2a578d;p=fw%2Faltos

diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index 67ac1b65..b4293c73 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_1;
 
-import java.lang.*;
 import java.text.*;
 import java.io.*;
 import java.util.concurrent.*;
@@ -44,6 +43,11 @@ public class AltosTelemetryReader extends AltosFlightReader {
 		telem.clear();
 	}
 
+	public void reset() {
+		previous = null;
+		flush();
+	}
+
 	public void close(boolean interrupted) {
 		link.remove_monitor(telem);
 		log.close();
@@ -59,19 +63,19 @@ public class AltosTelemetryReader extends AltosFlightReader {
 
 		try {
 			/* Version 1.0 or later firmware supports all telemetry formats */
-			if (serial.config_data().compare_version("1.0") >= 0)
+			if (link.config_data().compare_version("1.0") >= 0)
 				return true;
 
 			/* Version 0.9 firmware only supports 0.9 telemetry */
-			if (serial.config_data().compare_version("0.9") >= 0) {
-				if (telemetry == Altos.ao_telemetry_0_9)
+			if (link.config_data().compare_version("0.9") >= 0) {
+				if (telemetry == AltosLib.ao_telemetry_0_9)
 					return true;
 				else
 					return false;
 			}
 
 			/* Version 0.8 firmware only supports 0.8 telemetry */
-			if (telemetry == Altos.ao_telemetry_0_8)
+			if (telemetry == AltosLib.ao_telemetry_0_8)
 				return true;
 			else
 				return false;
@@ -103,17 +107,33 @@ 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;
+			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);
+		} catch (TimeoutException e) {
+			close(true);
+			throw(e);
+		} catch (InterruptedException e) {
+			close(true);
+			throw(e);
+		}
 	}
 }