X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosSerial.java;h=d02e25a965e7a9344b9ac0f6ab45b084a7953b40;hp=b016c1d65fbecfe0463c0e97933148cf10c2d55b;hb=c3f57ffdb6c74de90d982eacd604e658ce9b00a5;hpb=e76b9cc32bbcc5176d9bdd6f8d79778024627382

diff --git a/ao-tools/altosui/AltosSerial.java b/ao-tools/altosui/AltosSerial.java
index b016c1d6..d02e25a9 100644
--- 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 {
-		return reply_queue.take();
+		libaltos.altos_flush(altos);
+		String line = reply_queue.take();
+		return line;
 	}
 
 	public void add_monitor(LinkedBlockingQueue<String> q) {
@@ -104,10 +110,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,10 +120,15 @@ public class AltosSerial implements Runnable {
 			}
 			input_thread = null;
 		}
+		if (altos != null) {
+			libaltos.altos_free(altos);
+			altos = null;
+		}
 	}
 
 	public void putc(char c) {
-		libaltos.altos_putchar(altos, c);
+		if (altos != null)
+			libaltos.altos_putchar(altos, c);
 	}
 
 	public void print(String data) {
@@ -138,6 +147,22 @@ public class AltosSerial implements Runnable {
 			throw new FileNotFoundException(device.getPath());
 		input_thread = new Thread(this);
 		input_thread.start();
+		print("\nE 0\n");
+		try {
+			Thread.sleep(200);
+		} catch (InterruptedException e) {
+		}
+		flush();
+	}
+
+	public void set_channel(int channel) {
+		if (altos != null)
+			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() {