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

diff --git a/ao-tools/altosui/AltosSerial.java b/ao-tools/altosui/AltosSerial.java
index 073bfb78..5b47960f 100644
--- a/ao-tools/altosui/AltosSerial.java
+++ b/ao-tools/altosui/AltosSerial.java
@@ -37,12 +37,16 @@ import libaltosJNI.SWIGTYPE_p_altos_list;
  * line in a queue. Dealing with that queue is left up to other
  * threads.
  */
-class AltosSerialReader implements Runnable {
+
+public class AltosSerial implements Runnable {
+
 	SWIGTYPE_p_altos_file altos;
 	LinkedList<LinkedBlockingQueue<String>> monitors;
 	LinkedBlockingQueue<String> reply_queue;
 	Thread input_thread;
 	String line;
+	byte[] line_bytes;
+	int line_count;
 
 	public void run () {
 		int c;
@@ -58,18 +62,36 @@ class AltosSerialReader 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++;
 					}
 				}
 			}
@@ -77,8 +99,19 @@ class AltosSerialReader 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) {
@@ -102,10 +135,8 @@ class AltosSerialReader 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();
@@ -114,52 +145,57 @@ class AltosSerialReader implements Runnable {
 			}
 			input_thread = null;
 		}
+		if (altos != null) {
+			libaltos.altos_free(altos);
+			altos = null;
+		}
 	}
 
-	public void open(altos_device device) throws FileNotFoundException {
-		close();
-		altos = libaltos.altos_open(device);
-		input_thread = new Thread(this);
-		input_thread.start();
+	public void putc(char c) {
+		if (altos != null)
+			libaltos.altos_putchar(altos, c);
 	}
-	public AltosSerialReader () {
-		altos = null;
-		input_thread = null;
-		line = "";
-		monitors = new LinkedList<LinkedBlockingQueue<String>> ();
-		reply_queue = new LinkedBlockingQueue<String> ();
-	}
-}
-
-public class AltosSerial {
-	AltosSerialReader reader = null;
 
-	public void close() {
-		reader.close();
+	public void print(String data) {
+//h		System.out.printf("\"%s\" ", data);
+		for (int i = 0; i < data.length(); i++)
+			putc(data.charAt(i));
 	}
 
-	public void open(altos_device device) throws FileNotFoundException {
-		reader.open(device);
+	public void printf(String format, Object ... arguments) {
+		print(String.format(format, arguments));
 	}
 
-	void init() {
-		reader = new AltosSerialReader();
+	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 add_monitor(LinkedBlockingQueue<String> q) {
-		reader.add_monitor(q);
+	public void set_channel(int channel) {
+		if (altos != null)
+			printf("m 0\nc r %d\nm 1\n", channel);
 	}
 
-	public void remove_monitor(LinkedBlockingQueue<String> q) {
-		reader.remove_monitor(q);
+	public void set_callsign(String callsign) {
+		if (altos != null)
+			printf ("c c %s\n", callsign);
 	}
 
 	public AltosSerial() {
-		init();
-	}
-
-	public AltosSerial(altos_device device) throws FileNotFoundException {
-		init();
-		open(device);
+		altos = null;
+		input_thread = null;
+		line = "";
+		monitors = new LinkedList<LinkedBlockingQueue<String>> ();
+		reply_queue = new LinkedBlockingQueue<String> ();
 	}
 }