X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryReader.java;h=bec518516f9113ac7b2c5749ba39fd872b97c947;hp=bfa5db5c01815a039357b1f4f007b84f9262cff3;hb=aa7dd289ee72f7a49a08ce0229c4e0e0404499d0;hpb=03563c765d8b0ab3689c91b2b533c68e11650577

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
index bfa5db5c..bec51851 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
@@ -1,75 +1,134 @@
-package org.altusmetrum.AltosDroid;
-
-import java.text.*;
-import java.io.*;
-import java.util.concurrent.*;
-import android.util.Log;
-import android.os.Handler;
-
-import org.altusmetrum.AltosLib.*;
-
-
-public class TelemetryReader extends Thread {
-
-	private static final String TAG = "TelemetryReader";
-
-	int         crc_errors;
-
-	Handler     handler;
-
-	AltosLink   link;
-	AltosRecord previous;
-
-	LinkedBlockingQueue<AltosLine> telem;
-
-	public AltosRecord read() throws ParseException, AltosCRCException, InterruptedException, 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;
-	}
-
-	public void close() {
-		previous = null;
-		link.remove_monitor(telem);
-		link = null;
-		telem.clear();
-		telem = null;
-	}
-
-	public void run() {
-		AltosState  state = null;
-
-		try {
-			for (;;) {
-				try {
-					AltosRecord record = read();
-					if (record == null)
-						break;
-					state = new AltosState(record, state);
-
-					handler.obtainMessage(TelemetryService.MSG_TELEMETRY, state).sendToTarget();
-				} catch (ParseException pp) {
-					Log.e(TAG, String.format("Parse error: %d \"%s\"", pp.getErrorOffset(), pp.getMessage()));
-				} catch (AltosCRCException ce) {
-					++crc_errors;
-				}
-			}
-		} catch (InterruptedException ee) {
-		} catch (IOException ie) {
-		} finally {
-			close();
-		}
-	}
-
-	public TelemetryReader (AltosLink in_link, Handler in_handler) {
-		link    = in_link;
-		handler = in_handler;
-
-		previous = null;
-		telem = new LinkedBlockingQueue<AltosLine>();
-		link.add_monitor(telem);
-	}
-}
+/*
+ * Copyright © 2011 Keith Packard <keithp@keithp.com>
+ * Copyright © 2012 Mike Beattie <mike@ethernal.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+
+package org.altusmetrum.AltosDroid;
+
+import java.text.*;
+import java.io.*;
+import java.util.concurrent.*;
+import android.util.Log;
+import android.os.Handler;
+
+import org.altusmetrum.altoslib_5.*;
+
+
+public class TelemetryReader extends Thread {
+
+	private static final String TAG = "TelemetryReader";
+
+	int         crc_errors;
+
+	Handler     handler;
+
+	AltosLink   link;
+	AltosState  state = null;
+
+	AltosFlightReader	stacked;
+
+	LinkedBlockingQueue<AltosLine> telemQueue;
+
+	public AltosState read() throws ParseException, AltosCRCException, InterruptedException, IOException {
+		if (stacked != null) {
+			state = stacked.read();
+			if (state != null)
+				return state;
+			stacked = null;
+		}
+		AltosLine l = telemQueue.take();
+		if (l.line == null)
+			throw new IOException("IO error");
+		AltosTelemetry telem = AltosTelemetryLegacy.parse(l.line);
+		if (state == null)
+			state = new AltosState();
+		else
+			state = state.clone();
+		telem.update_state(state);
+		return state;
+	}
+
+	public void close() {
+		state = null;
+		if (stacked != null) {
+			stacked.close(false);
+			stacked = null;
+		}
+		link.remove_monitor(telemQueue);
+		link = null;
+		telemQueue.clear();
+		telemQueue = null;
+	}
+
+	public void run() {
+		AltosState  state = null;
+
+		try {
+			while (telemQueue != null) {
+				try {
+					state = read();
+					handler.obtainMessage(TelemetryService.MSG_TELEMETRY, state).sendToTarget();
+				} catch (ParseException pp) {
+					Log.e(TAG, String.format("Parse error: %d \"%s\"", pp.getErrorOffset(), pp.getMessage()));
+				} catch (AltosCRCException ce) {
+					++crc_errors;
+					handler.obtainMessage(TelemetryService.MSG_CRC_ERROR, new Integer(crc_errors)).sendToTarget();
+				}
+			}
+		} catch (InterruptedException ee) {
+		} catch (IOException ie) {
+		} finally {
+			close();
+		}
+	}
+
+	public TelemetryReader (AltosLink in_link, Handler in_handler, AltosFlightReader in_stacked) {
+		link    = in_link;
+		handler = in_handler;
+		stacked = in_stacked;
+
+		state = null;
+		telemQueue = new LinkedBlockingQueue<AltosLine>();
+		link.add_monitor(telemQueue);
+		try {
+			link.set_radio_frequency(AltosPreferences.frequency(link.serial));
+			link.set_telemetry(AltosLib.ao_telemetry_standard);
+			link.set_telemetry_rate(AltosPreferences.telemetry_rate(link.serial));
+		} catch (InterruptedException ee) {
+			close();
+		} catch (TimeoutException te) {
+			close();
+		}
+	}
+
+	private static AltosFlightReader existing_data(AltosLink link) {
+		if (link == null)
+			return null;
+
+		File	file = AltosPreferences.logfile(link.serial);
+		if (file != null) {
+			AltosStateIterable	iterable = AltosStateIterable.iterable(file);
+			if (iterable != null)
+				return new AltosReplayReader(iterable.iterator(), file, false);
+		}
+		return null;
+	}
+
+	public TelemetryReader(AltosLink link, Handler handler) {
+		this(link, handler, existing_data(link));
+	}
+}