projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump version to 1.1.9.1
[fw/altos]
/
altoslib
/
AltosLink.java
diff --git
a/altoslib/AltosLink.java
b/altoslib/AltosLink.java
index d59e73ba6eca2a690da98f0d46e9db7e6c870919..6d510563c5d32622bfbc3cfb854da885c21b4f27 100644
(file)
--- a/
altoslib/AltosLink.java
+++ b/
altoslib/AltosLink.java
@@
-17,13
+17,11
@@
package org.altusmetrum.AltosLib;
package org.altusmetrum.AltosLib;
-import java.lang.*;
import java.io.*;
import java.util.concurrent.*;
import java.util.*;
import java.io.*;
import java.util.concurrent.*;
import java.util.*;
-import java.text.*;
-public abstract class AltosLink {
+public abstract class AltosLink
implements Runnable
{
public final static int ERROR = -1;
public final static int TIMEOUT = -2;
public final static int ERROR = -1;
public final static int TIMEOUT = -2;
@@
-101,15
+99,23
@@
public abstract class AltosLink {
try {
for (;;) {
c = getchar();
try {
for (;;) {
c = getchar();
- if (Thread.interrupted())
+ if (Thread.interrupted()) {
+ if (debug)
+ System.out.printf("INTERRUPTED\n");
break;
break;
+ }
if (c == ERROR) {
if (c == ERROR) {
+ if (debug)
+ System.out.printf("ERROR\n");
add_telem (new AltosLine());
add_reply (new AltosLine());
break;
}
add_telem (new AltosLine());
add_reply (new AltosLine());
break;
}
- if (c == TIMEOUT)
+ if (c == TIMEOUT) {
+ if (debug)
+ System.out.printf("TIMEOUT\n");
continue;
continue;
+ }
if (c == '\r')
continue;
synchronized(this) {
if (c == '\r')
continue;
synchronized(this) {
@@
-180,6
+186,14
@@
public abstract class AltosLink {
reply_queue.put (line);
}
reply_queue.put (line);
}
+ public void abort_reply() {
+ try {
+ add_telem (new AltosLine());
+ add_reply (new AltosLine());
+ } catch (InterruptedException e) {
+ }
+ }
+
public void add_string(String line) throws InterruptedException {
if (line.startsWith("TELEM") || line.startsWith("VERSION") || line.startsWith("CRC")) {
add_telem(new AltosLine(line));
public void add_string(String line) throws InterruptedException {
if (line.startsWith("TELEM") || line.startsWith("VERSION") || line.startsWith("CRC")) {
add_telem(new AltosLine(line));