projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: flush replies from serial link when entering debug mode
[fw/altos]
/
ao-tools
/
altosui
/
AltosSerial.java
diff --git
a/ao-tools/altosui/AltosSerial.java
b/ao-tools/altosui/AltosSerial.java
index efa63f681819e2ed9f3d22ebfac66d79e47f7750..3684f253ca6532f4ccf439d3e07f8266e97821e1 100644
(file)
--- a/
ao-tools/altosui/AltosSerial.java
+++ b/
ao-tools/altosui/AltosSerial.java
@@
-66,8
+66,10
@@
public class AltosSerial implements Runnable {
LinkedBlockingQueue<String> q = monitors.get(e);
q.put(line);
}
LinkedBlockingQueue<String> q = monitors.get(e);
q.put(line);
}
- } else
+ } else {
+// System.out.printf("GOT: %s\n", line);
reply_queue.put(line);
reply_queue.put(line);
+ }
line = "";
}
} else {
line = "";
}
} else {
@@
-79,8
+81,19
@@
public class AltosSerial implements Runnable {
}
}
}
}
+ public void flush_reply() {
+ libaltos.altos_flush(altos);
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException ie) {
+ }
+ 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) {
@@
-126,6
+139,7
@@
public class AltosSerial implements Runnable {
}
public void print(String data) {
}
public void print(String data) {
+// System.out.printf("\"%s\" ", data);
for (int i = 0; i < data.length(); i++)
putc(data.charAt(i));
}
for (int i = 0; i < data.length(); i++)
putc(data.charAt(i));
}
@@
-154,6
+168,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;