projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update ChangeLog for 1.9.18 release
[fw/altos]
/
micropeak
/
MicroSerial.java
diff --git
a/micropeak/MicroSerial.java
b/micropeak/MicroSerial.java
index 8d20718f7f0c8f2ef950ee0f034db2833da614c9..c688242874837c2c60c9093191e3d847e920867a 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
@@
-20,13
+21,15
@@
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
.*;
+import org.altusmetrum.altosuilib_
14
.*;
public class MicroSerial extends InputStream {
SWIGTYPE_p_altos_file file;
private MicroSerialLog log;
public int read() {
public class MicroSerial extends InputStream {
SWIGTYPE_p_altos_file file;
private MicroSerialLog log;
public int read() {
+ if (file == null)
+ return -1;
int c = libaltos.altos_getchar(file, 0);
if (Thread.interrupted())
return -1;
int c = libaltos.altos_getchar(file, 0);
if (Thread.interrupted())
return -1;
@@
-39,6
+42,14
@@
public class MicroSerial extends InputStream {
return c;
}
return c;
}
+ public void write(char c) {
+ libaltos.altos_putchar(file, c);
+ }
+
+ public void flush() {
+ libaltos.altos_flush(file);
+ }
+
public void close() {
if (file != null) {
libaltos.altos_close(file);
public void close() {
if (file != null) {
libaltos.altos_close(file);