projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Use symbols in AltosRomconfig instead of fixed offsets
[fw/altos]
/
micropeak
/
MicroSerial.java
diff --git
a/micropeak/MicroSerial.java
b/micropeak/MicroSerial.java
index afe5553285bdcf11e8da9263f54c5bd9c571f59c..376223f16098a38e8fe262a5f40161b7aba3e5f2 100644
(file)
--- a/
micropeak/MicroSerial.java
+++ b/
micropeak/MicroSerial.java
@@
-16,15
+16,24
@@
*/
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_1.*;
public class MicroSerial extends InputStream {
SWIGTYPE_p_altos_file file;
public int read() {
public class MicroSerial extends InputStream {
SWIGTYPE_p_altos_file file;
public int read() {
- return libaltos.altos_getchar(file, 0);
+ int c = libaltos.altos_getchar(file, 0);
+ if (Thread.interrupted())
+ return -1;
+ if (c == -1)
+ return -1;
+ if (AltosUIPreferences.serial_debug)
+ System.out.printf("%c", c);
+ return c;
}
public void close() {
}
public void close() {
@@
-34,12
+43,12
@@
public class MicroSerial extends InputStream {
}
}
}
}
- public MicroSerial(
MicroUSB usb
) throws FileNotFoundException {
- file =
usb
.open();
+ public MicroSerial(
AltosDevice device
) throws FileNotFoundException {
+ file =
device
.open();
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));
}
}