X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMicroSerial.java;h=43dfd18bd35f4cd1c898e96bf3e0d353aa23aca1;hp=376223f16098a38e8fe262a5f40161b7aba3e5f2;hb=dcf533d5befffa4c9c872f3c3d21d11ffeb61307;hpb=8d1d8d2a3c129cdbd55427bcda0f26715b02f1ee

diff --git a/micropeak/MicroSerial.java b/micropeak/MicroSerial.java
index 376223f1..43dfd18b 100644
--- a/micropeak/MicroSerial.java
+++ b/micropeak/MicroSerial.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
@@ -20,10 +21,11 @@ package org.altusmetrum.micropeak;
 import java.util.*;
 import java.io.*;
 import libaltosJNI.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altosuilib_11.*;
 
 public class MicroSerial extends InputStream {
 	SWIGTYPE_p_altos_file	file;
+	private MicroSerialLog	log;
 
 	public int read() {
 		int	c = libaltos.altos_getchar(file, 0);
@@ -33,6 +35,8 @@ public class MicroSerial extends InputStream {
 			return -1;
 		if (AltosUIPreferences.serial_debug)
 			System.out.printf("%c", c);
+		if (log != null)
+			log.log_char(c);
 		return c;
 	}
 
@@ -43,8 +47,13 @@ public class MicroSerial extends InputStream {
 		}
 	}
 
+	public void set_log(MicroSerialLog log) {
+		this.log = log;
+	}
+
 	public MicroSerial(AltosDevice device) throws FileNotFoundException {
 		file = device.open();
+		log = null;
 		if (file == null) {
 			final String message = device.getErrorString();
 			throw new FileNotFoundException(String.format("%s (%s)",