Merge branch 'new-debian' into debian

Conflicts:
	ChangeLog
	debian/altos.install
	debian/changelog
	debian/control
	debian/copyright
	debian/dirs
	debian/docs
	debian/menu
	debian/rules
	src/Makefile

1 files changed, 123 insertions, 0 deletions

diff --git a/altoslib/AltosLog.java b/altoslib/AltosLog.java
new file mode 100644
index 00000000..3c124700
--- /dev/null
+++ b/altoslib/AltosLog.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright © 2010 Keith Packard <keithp@keithp.com>
+ *
+ * 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.AltosLib;
+
+import java.io.*;
+import java.text.ParseException;
+import java.util.concurrent.LinkedBlockingQueue;
+
+/*
+ * This creates a thread to capture telemetry data and write it to
+ * a log file
+ */
+class AltosLog implements Runnable {
+
+	LinkedBlockingQueue<AltosLine>	input_queue;
+	LinkedBlockingQueue<String>	pending_queue;
+	int				serial;
+	int				flight;
+	FileWriter			log_file;
+	Thread				log_thread;
+	AltosFile			file;
+
+	private void close_log_file() {
+		if (log_file != null) {
+			try {
+				log_file.close();
+			} catch (IOException io) {
+			}
+			log_file = null;
+		}
+	}
+
+	void close() {
+		close_log_file();
+		if (log_thread != null) {
+			log_thread.interrupt();
+			log_thread = null;
+		}
+	}
+
+	File file() {
+		return file;
+	}
+
+	boolean open (AltosRecord telem) throws IOException {
+		AltosFile	a = new AltosFile(telem);
+
+		log_file = new FileWriter(a, true);
+		if (log_file != null) {
+			while (!pending_queue.isEmpty()) {
+				try {
+					String s = pending_queue.take();
+					log_file.write(s);
+					log_file.write('\n');
+				} catch (InterruptedException ie) {
+				}
+			}
+			log_file.flush();
+			file = a;
+		}
+		return log_file != null;
+	}
+
+	public void run () {
+		try {
+			AltosRecord	previous = null;
+			for (;;) {
+				AltosLine	line = input_queue.take();
+				if (line.line == null)
+					continue;
+				try {
+					AltosRecord	telem = AltosTelemetry.parse(line.line, previous);
+					if (telem.serial != 0 && telem.flight != 0 &&
+					    (telem.serial != serial || telem.flight != flight || log_file == null))
+					{
+						close_log_file();
+						serial = telem.serial;
+						flight = telem.flight;
+						open(telem);
+					}
+					previous = telem;
+				} catch (ParseException pe) {
+				} catch (AltosCRCException ce) {
+				}
+				if (log_file != null) {
+					log_file.write(line.line);
+					log_file.write('\n');
+					log_file.flush();
+				} else
+					pending_queue.put(line.line);
+			}
+		} catch (InterruptedException ie) {
+		} catch (IOException ie) {
+		}
+		close();
+	}
+
+	public AltosLog (AltosLink link) {
+		pending_queue = new LinkedBlockingQueue<String> ();
+		input_queue = new LinkedBlockingQueue<AltosLine> ();
+		link.add_monitor(input_queue);
+		serial = -1;
+		flight = -1;
+		log_file = null;
+		log_thread = new Thread(this);
+		log_thread.start();
+	}
+}