projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Make AltosPreferencesBackend abstract. Add set/put Serializable
[fw/altos]
/
micropeak
/
MicroSerial.java
diff --git
a/micropeak/MicroSerial.java
b/micropeak/MicroSerial.java
index 15ef858244bcfa5cc3efee138d56caf008115bdc..ea68aa1ad1441072b4b6b9867186788925052e0b 100644
(file)
--- a/
micropeak/MicroSerial.java
+++ b/
micropeak/MicroSerial.java
@@
-20,10
+20,11
@@
package org.altusmetrum.micropeak;
import java.util.*;
import java.io.*;
import libaltosJNI.*;
import java.util.*;
import java.io.*;
import libaltosJNI.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altosuilib
_10
.*;
public class MicroSerial extends InputStream {
SWIGTYPE_p_altos_file file;
public class MicroSerial extends InputStream {
SWIGTYPE_p_altos_file file;
+ private MicroSerialLog log;
public int read() {
int c = libaltos.altos_getchar(file, 0);
public int read() {
int c = libaltos.altos_getchar(file, 0);
@@
-33,6
+34,8
@@
public class MicroSerial extends InputStream {
return -1;
if (AltosUIPreferences.serial_debug)
System.out.printf("%c", c);
return -1;
if (AltosUIPreferences.serial_debug)
System.out.printf("%c", c);
+ if (log != null)
+ log.log_char(c);
return c;
}
return c;
}
@@
-43,8
+46,13
@@
public class MicroSerial extends InputStream {
}
}
}
}
+ public void set_log(MicroSerialLog log) {
+ this.log = log;
+ }
+
public MicroSerial(AltosDevice device) throws FileNotFoundException {
file = device.open();
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)",
if (file == null) {
final String message = device.getErrorString();
throw new FileNotFoundException(String.format("%s (%s)",