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

diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index 112e008e..f365b821 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();
@@ -106,14 +110,22 @@ public class AltosTelemetryReader extends AltosFlightReader {
 	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);
+		}
 	}
 }