X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosLog.java;h=7065614b21c50f52a5f59eca71dc691084282c03;hp=70c017b7df950c2353ed21d57346b9b6305f72fc;hb=HEAD;hpb=b89fb51a963635e2effe3a31f803bfc29c2c46b7

diff --git a/altoslib/AltosLog.java b/altoslib/AltosLog.java
index 70c017b7..7dc9fd4c 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,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_14;
 
 import java.io.*;
 import java.text.*;
@@ -36,6 +37,12 @@ public class AltosLog implements Runnable {
 	Thread				log_thread;
 	AltosFile			file;
 	AltosLink			link;
+	AltosLogTrace			trace;
+
+	private void trace(String format, Object ... arguments) {
+		if (trace != null)
+			trace.trace(format, arguments);
+	}
 
 	private void close_log_file() {
 		if (log_file != null) {
@@ -48,6 +55,7 @@ public class AltosLog implements Runnable {
 	}
 
 	public void close() {
+		link.remove_monitor(input_queue);
 		close_log_file();
 		if (log_thread != null) {
 			log_thread.interrupt();
@@ -59,11 +67,26 @@ public class AltosLog implements Runnable {
 		return file;
 	}
 
-	boolean open (AltosState state) throws IOException, InterruptedException {
-		AltosFile	a = new AltosFile(state);
+	boolean open (AltosCalData cal_data) throws IOException, InterruptedException {
+		trace("open serial %d flight %d receiver_serial %d",
+		      cal_data.serial,
+		      cal_data.flight,
+		      cal_data.receiver_serial);
+
+		AltosFile	a = new AltosFile(cal_data);
+
+		trace("open file %s\n", a.getPath());
 
-		log_file = new FileWriter(a, true);
+		try {
+			log_file = new FileWriter(a, true);
+		} catch (IOException ie) {
+			log_file = null;
+			trace("open file failed\n");
+			if (trace != null)
+				trace.open_failed(a);
+		}
 		if (log_file != null) {
+			trace("open file success\n");
 			while (!pending_queue.isEmpty()) {
 				String s = pending_queue.take();
 				log_file.write(s);
@@ -71,30 +94,39 @@ public class AltosLog implements Runnable {
 			}
 			log_file.flush();
 			file = a;
+			AltosPreferences.set_logfile(link.serial, file);
 		}
 		return log_file != null;
 	}
 
 	public void run () {
+		trace("log run start\n");
 		try {
-			AltosState	state = new AltosState();
 			AltosConfigData	receiver_config = link.config_data();
-			state.set_receiver_serial(receiver_config.serial);
+			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 {
 					AltosTelemetry	telem = AltosTelemetry.parse(line.line);
-					state = state.clone();
-					telem.update_state(state);
-					if (state.serial != serial || state.flight != flight || log_file == null)
+					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 = state.serial;
-						flight = state.flight;
-						if (state.serial != AltosLib.MISSING && state.flight != AltosLib.MISSING)
-							open(state);
+						serial = cal_data.serial;
+						flight = cal_data.flight;
+						state = null;
+						if (cal_data.serial != AltosLib.MISSING &&
+						    cal_data.flight != AltosLib.MISSING)
+							open(cal_data);
 					}
 				} catch (ParseException pe) {
 				} catch (AltosCRCException ce) {
@@ -107,21 +139,30 @@ public class AltosLog implements Runnable {
 					pending_queue.put(line.line);
 			}
 		} catch (InterruptedException ie) {
+			trace("interrupted exception\n");
 		} catch (TimeoutException te) {
+			trace("timeout exception\n");
 		} catch (IOException ie) {
+			trace("io exception %s message %s\n", ie.toString(), ie.getMessage());
 		}
+		trace("log run done\n");
 		close();
 	}
 
-	public AltosLog (AltosLink link) {
+	public AltosLog (AltosLink link, AltosLogTrace trace) {
 		pending_queue = new LinkedBlockingQueue<String> ();
 		input_queue = new LinkedBlockingQueue<AltosLine> ();
 		link.add_monitor(input_queue);
 		serial = -1;
 		flight = -1;
+		this.trace = trace;
 		this.link = link;
 		log_file = null;
 		log_thread = new Thread(this);
 		log_thread.start();
 	}
+
+	public AltosLog (AltosLink link) {
+		this(link, null);
+	}
 }