projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: Place html book contents on left side of page with separate scrollbar
[fw/altos]
/
micropeak
/
MicroSerial.java
diff --git
a/micropeak/MicroSerial.java
b/micropeak/MicroSerial.java
index 8546276ed9dcc7c79e66cc2241f53d6ab5b46237..8d20718f7f0c8f2ef950ee0f034db2833da614c9 100644
(file)
--- a/
micropeak/MicroSerial.java
+++ b/
micropeak/MicroSerial.java
@@
-16,17
+16,26
@@
*/
package org.altusmetrum.micropeak;
*/
package org.altusmetrum.micropeak;
+
import java.util.*;
import java.io.*;
import libaltosJNI.*;
import java.util.*;
import java.io.*;
import libaltosJNI.*;
+import org.altusmetrum.altosuilib_8.*;
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);
- if (MicroPreferences.serial_debug)
+ if (Thread.interrupted())
+ return -1;
+ if (c == -1)
+ return -1;
+ if (AltosUIPreferences.serial_debug)
System.out.printf("%c", c);
System.out.printf("%c", c);
+ if (log != null)
+ log.log_char(c);
return c;
}
return c;
}
@@
-37,12
+46,17
@@
public class MicroSerial extends InputStream {
}
}
}
}
- public MicroSerial(MicroUSB usb) throws FileNotFoundException {
- file = usb.open();
+ public void set_log(MicroSerialLog log) {
+ this.log = log;
+ }
+
+ public MicroSerial(AltosDevice device) throws FileNotFoundException {
+ file = device.open();
+ log = null;
if (file == null) {
if (file == null) {
- final String message =
usb
.getErrorString();
+ final String message =
device
.getErrorString();
throw new FileNotFoundException(String.format("%s (%s)",
throw new FileNotFoundException(String.format("%s (%s)",
-
usb
.toShortString(),
+
device
.toShortString(),
message));
}
}
message));
}
}