X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosSerial.java;h=3684f253ca6532f4ccf439d3e07f8266e97821e1;hb=3dc67c1401976d6e9e2e942d5a4707a4810a0404;hp=e84f5b63e4e21c7ca5cdd0cbb0cb90c863383ced;hpb=172a2817dde6718724f2b5fad5a7761801446fa0;p=fw%2Faltos

diff --git a/ao-tools/altosui/AltosSerial.java b/ao-tools/altosui/AltosSerial.java
index e84f5b63..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,13 +127,19 @@ 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) {
+//		System.out.printf("\"%s\" ", data);
 		for (int i = 0; i < data.length(); i++)
 			putc(data.charAt(i));
 	}
@@ -134,8 +151,26 @@ public class AltosSerial implements Runnable {
 	public void open(altos_device device) throws FileNotFoundException {
 		close();
 		altos = libaltos.altos_open(device);
+		if (altos == null)
+			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() {