X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosSerial.java;h=5b47960f79a28f8d7e4bd92977147b6eaad30587;hp=efa63f681819e2ed9f3d22ebfac66d79e47f7750;hb=a16db143fc7ca72dc91e7989420049192114642d;hpb=53c279b9e96da8b69837ae84038a78ca5707f2a5

diff --git a/ao-tools/altosui/AltosSerial.java b/ao-tools/altosui/AltosSerial.java
index efa63f68..5b47960f 100644
--- a/ao-tools/altosui/AltosSerial.java
+++ b/ao-tools/altosui/AltosSerial.java
@@ -45,6 +45,8 @@ public class AltosSerial implements Runnable {
 	LinkedBlockingQueue<String> reply_queue;
 	Thread input_thread;
 	String line;
+	byte[] line_bytes;
+	int line_count;
 
 	public void run () {
 		int c;
@@ -60,18 +62,36 @@ public class AltosSerial implements Runnable {
 					continue;
 				synchronized(this) {
 					if (c == '\n') {
-						if (line != "") {
+						if (line_count != 0) {
+							try {
+								line = new String(line_bytes, 0, line_count, "UTF-8");
+							} catch (UnsupportedEncodingException ue) {
+								line = "";
+								for (int i = 0; i < line_count; i++)
+									line = line + line_bytes[i];
+							}
 							if (line.startsWith("VERSION")) {
 								for (int e = 0; e < monitors.size(); e++) {
 									LinkedBlockingQueue<String> q = monitors.get(e);
 									q.put(line);
 								}
-							} else
+							} else {
+//								System.out.printf("GOT: %s\n", line);
 								reply_queue.put(line);
+							}
+							line_count = 0;
 							line = "";
 						}
 					} else {
-						line = line + (char) c;
+						if (line_bytes == null) {
+							line_bytes = new byte[256];
+						} else if (line_count == line_bytes.length) {
+							byte[] new_line_bytes = new byte[line_count * 2];
+							System.arraycopy(line_bytes, 0, new_line_bytes, 0, line_count);
+							line_bytes = new_line_bytes;
+						}
+						line_bytes[line_count] = (byte) c;
+						line_count++;
 					}
 				}
 			}
@@ -79,8 +99,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) {
@@ -126,6 +157,7 @@ public class AltosSerial implements Runnable {
 	}
 
 	public void print(String data) {
+//h		System.out.printf("\"%s\" ", data);
 		for (int i = 0; i < data.length(); i++)
 			putc(data.charAt(i));
 	}
@@ -154,6 +186,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;