projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/telefireone-v1.0: Doesn't have a beeper
[fw/altos]
/
micropeak
/
MicroSerial.java
diff --git
a/micropeak/MicroSerial.java
b/micropeak/MicroSerial.java
index afe5553285bdcf11e8da9263f54c5bd9c571f59c..04b58a87dab060e40ae4eaa02f691e5204d1499e 100644
(file)
--- 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
*
* 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
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-16,15
+17,27
@@
*/
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_13.*;
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() {
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);
+ if (log != null)
+ log.log_char(c);
+ return c;
}
public void close() {
}
public void close() {
@@
-34,12
+47,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));
}
}