X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosLog.java;h=3111a2cda462bd153e1345ca7a27f27032e18669;hp=3c12470045935abe9c9297db3c73d3569224e51f;hb=fab890328d4e1151932621a317226bc291b853da;hpb=e2b458a448106ba1ab207f0ea6824b56927d8547

diff --git a/altoslib/AltosLog.java b/altoslib/AltosLog.java
index 3c124700..3111a2cd 100644
--- a/altoslib/AltosLog.java
+++ b/altoslib/AltosLog.java
@@ -3,7 +3,8 @@
  *
  * 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.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,25 +16,27 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_13;
 
 import java.io.*;
-import java.text.ParseException;
-import java.util.concurrent.LinkedBlockingQueue;
+import java.text.*;
+import java.util.concurrent.*;
 
 /*
  * This creates a thread to capture telemetry data and write it to
  * a log file
  */
-class AltosLog implements Runnable {
+public class AltosLog implements Runnable {
 
 	LinkedBlockingQueue<AltosLine>	input_queue;
 	LinkedBlockingQueue<String>	pending_queue;
 	int				serial;
 	int				flight;
+	int				receiver_serial;
 	FileWriter			log_file;
 	Thread				log_thread;
 	AltosFile			file;
+	AltosLink			link;
 
 	private void close_log_file() {
 		if (log_file != null) {
@@ -45,7 +48,8 @@ class AltosLog implements Runnable {
 		}
 	}
 
-	void close() {
+	public void close() {
+		link.remove_monitor(input_queue);
 		close_log_file();
 		if (log_thread != null) {
 			log_thread.interrupt();
@@ -53,47 +57,55 @@ class AltosLog implements Runnable {
 		}
 	}
 
-	File file() {
+	public File file() {
 		return file;
 	}
 
-	boolean open (AltosRecord telem) throws IOException {
-		AltosFile	a = new AltosFile(telem);
+	boolean open (AltosCalData cal_data) throws IOException, InterruptedException {
+		AltosFile	a = new AltosFile(cal_data);
 
 		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) {
-				}
+				String s = pending_queue.take();
+				log_file.write(s);
+				log_file.write('\n');
 			}
 			log_file.flush();
 			file = a;
+			AltosPreferences.set_logfile(link.serial, file);
 		}
 		return log_file != null;
 	}
 
 	public void run () {
 		try {
-			AltosRecord	previous = null;
+			AltosConfigData	receiver_config = link.config_data();
+			AltosCalData	cal_data = new AltosCalData();
+			AltosState	state = null;
+			cal_data.set_receiver_serial(receiver_config.serial);
 			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))
+					AltosTelemetry	telem = AltosTelemetry.parse(line.line);
+					if (state == null)
+						state = new AltosState(cal_data);
+					telem.provide_data(state);
+
+					if (cal_data.serial != serial ||
+					    cal_data.flight != flight ||
+					    log_file == null)
 					{
 						close_log_file();
-						serial = telem.serial;
-						flight = telem.flight;
-						open(telem);
+						serial = cal_data.serial;
+						flight = cal_data.flight;
+						state = null;
+						if (cal_data.serial != AltosLib.MISSING &&
+						    cal_data.flight != AltosLib.MISSING)
+							open(cal_data);
 					}
-					previous = telem;
 				} catch (ParseException pe) {
 				} catch (AltosCRCException ce) {
 				}
@@ -105,6 +117,7 @@ class AltosLog implements Runnable {
 					pending_queue.put(line.line);
 			}
 		} catch (InterruptedException ie) {
+		} catch (TimeoutException te) {
 		} catch (IOException ie) {
 		}
 		close();
@@ -116,6 +129,7 @@ class AltosLog implements Runnable {
 		link.add_monitor(input_queue);
 		serial = -1;
 		flight = -1;
+		this.link = link;
 		log_file = null;
 		log_thread = new Thread(this);
 		log_thread.start();