X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosSerial.java;h=3684f253ca6532f4ccf439d3e07f8266e97821e1;hp=f12b31b3187e9b253b4a3560080db9d8e2966d7e;hb=99400fdc0f19ef538fc362dde5c3ab5b7cdac409;hpb=71da54a5ce255395376a44586782ab8b6f3b289f

diff --git a/ao-tools/altosui/AltosSerial.java b/ao-tools/altosui/AltosSerial.java
index f12b31b3..3684f253 100644
--- 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);
 								}
-							} else
+							} else {
+//								System.out.printf("GOT: %s\n", line);
 								reply_queue.put(line);
+							}
 							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 {
-		return reply_queue.take();
+		libaltos.altos_flush(altos);
+		String line = reply_queue.take();
+		return line;
 	}
 
 	public void add_monitor(LinkedBlockingQueue<String> q) {
@@ -104,10 +117,8 @@ public class AltosSerial implements Runnable {
 	}
 
 	public void close() {
-		if (altos != null) {
+		if (altos != null)
 			libaltos.altos_close(altos);
-			altos = null;
-		}
 		if (input_thread != null) {
 			try {
 				input_thread.interrupt();
@@ -116,6 +127,10 @@ public class AltosSerial implements Runnable {
 			}
 			input_thread = null;
 		}
+		if (altos != null) {
+			libaltos.altos_free(altos);
+			altos = null;
+		}
 	}
 
 	public void putc(char c) {
@@ -124,6 +139,7 @@ public class AltosSerial implements Runnable {
 	}
 
 	public void print(String data) {
+//		System.out.printf("\"%s\" ", data);
 		for (int i = 0; i < data.length(); i++)
 			putc(data.charAt(i));
 	}
@@ -139,7 +155,7 @@ public class AltosSerial implements Runnable {
 			throw new FileNotFoundException(device.getPath());
 		input_thread = new Thread(this);
 		input_thread.start();
-		print("\nE 0\nm 1\n");
+		print("\nE 0\n");
 		try {
 			Thread.sleep(200);
 		} catch (InterruptedException e) {
@@ -152,6 +168,11 @@ public class AltosSerial implements Runnable {
 			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;