projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: flush serial output before waiting for reply
[fw/altos]
/
ao-tools
/
altosui
/
AltosSerial.java
diff --git
a/ao-tools/altosui/AltosSerial.java
b/ao-tools/altosui/AltosSerial.java
index f12b31b3187e9b253b4a3560080db9d8e2966d7e..d02e25a965e7a9344b9ac0f6ab45b084a7953b40 100644
(file)
--- a/
ao-tools/altosui/AltosSerial.java
+++ b/
ao-tools/altosui/AltosSerial.java
@@
-79,8
+79,14
@@
public class AltosSerial implements Runnable {
}
}
}
}
+ public void flush_reply() {
+ reply_queue.clear();
+ }
+
public String get_reply() throws InterruptedException {
public String get_reply() throws InterruptedException {
- return reply_queue.take();
+ libaltos.altos_flush(altos);
+ String line = reply_queue.take();
+ return line;
}
public void add_monitor(LinkedBlockingQueue<String> q) {
}
public void add_monitor(LinkedBlockingQueue<String> q) {
@@
-104,10
+110,8
@@
public class AltosSerial implements Runnable {
}
public void close() {
}
public void close() {
- if (altos != null)
{
+ if (altos != null)
libaltos.altos_close(altos);
libaltos.altos_close(altos);
- altos = null;
- }
if (input_thread != null) {
try {
input_thread.interrupt();
if (input_thread != null) {
try {
input_thread.interrupt();
@@
-116,6
+120,10
@@
public class AltosSerial implements Runnable {
}
input_thread = null;
}
}
input_thread = null;
}
+ if (altos != null) {
+ libaltos.altos_free(altos);
+ altos = null;
+ }
}
public void putc(char c) {
}
public void putc(char c) {
@@
-139,7
+147,7
@@
public class AltosSerial implements Runnable {
throw new FileNotFoundException(device.getPath());
input_thread = new Thread(this);
input_thread.start();
throw new FileNotFoundException(device.getPath());
input_thread = new Thread(this);
input_thread.start();
- print("\nE 0\n
m 1\n
");
+ print("\nE 0\n");
try {
Thread.sleep(200);
} catch (InterruptedException e) {
try {
Thread.sleep(200);
} catch (InterruptedException e) {
@@
-152,6
+160,11
@@
public class AltosSerial implements Runnable {
printf("m 0\nc r %d\nm 1\n", channel);
}
printf("m 0\nc r %d\nm 1\n", channel);
}
+ public void set_callsign(String callsign) {
+ if (altos != null)
+ printf ("c c %s\n", callsign);
+ }
+
public AltosSerial() {
altos = null;
input_thread = null;
public AltosSerial() {
altos = null;
input_thread = null;