X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosSerial.java;h=99a92fdba5153c69aa8569de3a21012220172a43;hp=c4a7ad76a9437117f25091caf9038ced7df1abd0;hb=dcfa56498d1b65a213b8aba9cbd6c4806532383c;hpb=ba65e4aeb952a1cf49a77f1e24e235508fcea71f

diff --git a/ao-tools/altosui/AltosSerial.java b/ao-tools/altosui/AltosSerial.java
index c4a7ad76..99a92fdb 100644
--- a/ao-tools/altosui/AltosSerial.java
+++ b/ao-tools/altosui/AltosSerial.java
@@ -23,14 +23,10 @@ package altosui;
 
 import java.lang.*;
 import java.io.*;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.LinkedList;
-import java.util.Iterator;
-import altosui.AltosSerialMonitor;
-import libaltosJNI.libaltos;
-import libaltosJNI.altos_device;
-import libaltosJNI.SWIGTYPE_p_altos_file;
-import libaltosJNI.SWIGTYPE_p_altos_list;
+import java.util.concurrent.*;
+import java.util.*;
+
+import libaltosJNI.*;
 
 /*
  * This class reads from the serial port and places each received
@@ -40,9 +36,12 @@ import libaltosJNI.SWIGTYPE_p_altos_list;
 
 public class AltosSerial implements Runnable {
 
+	static List<String> devices_opened = Collections.synchronizedList(new LinkedList<String>());
+
+	altos_device device;
 	SWIGTYPE_p_altos_file altos;
-	LinkedList<LinkedBlockingQueue<String>> monitors;
-	LinkedBlockingQueue<String> reply_queue;
+	LinkedList<LinkedBlockingQueue<AltosLine>> monitors;
+	LinkedBlockingQueue<AltosLine> reply_queue;
 	Thread input_thread;
 	String line;
 	byte[] line_bytes;
@@ -57,7 +56,15 @@ public class AltosSerial implements Runnable {
 				c = libaltos.altos_getchar(altos, 0);
 				if (Thread.interrupted())
 					break;
-				if (c == -1)
+				if (c == libaltosConstants.LIBALTOS_ERROR) {
+					for (int e = 0; e < monitors.size(); e++) {
+						LinkedBlockingQueue<AltosLine> q = monitors.get(e);
+						q.put(new AltosLine());
+					}
+					reply_queue.put (new AltosLine());
+					break;
+				}
+				if (c == libaltosConstants.LIBALTOS_TIMEOUT)
 					continue;
 				if (c == '\r')
 					continue;
@@ -73,12 +80,12 @@ public class AltosSerial implements Runnable {
 							}
 							if (line.startsWith("VERSION") || line.startsWith("CRC")) {
 								for (int e = 0; e < monitors.size(); e++) {
-									LinkedBlockingQueue<String> q = monitors.get(e);
-									q.put(line);
+									LinkedBlockingQueue<AltosLine> q = monitors.get(e);
+									q.put(new AltosLine (line));
 								}
 							} else {
 //								System.out.printf("GOT: %s\n", line);
-								reply_queue.put(line);
+								reply_queue.put(new AltosLine (line));
 							}
 							line_count = 0;
 							line = "";
@@ -101,7 +108,8 @@ public class AltosSerial implements Runnable {
 	}
 
 	public void flush_output() {
-		libaltos.altos_flush(altos);
+		if (altos != null)
+			libaltos.altos_flush(altos);
 	}
 
 	public void flush_input() {
@@ -120,25 +128,21 @@ public class AltosSerial implements Runnable {
 
 	public String get_reply() throws InterruptedException {
 		flush_output();
-		String line = reply_queue.take();
-		return line;
+		AltosLine line = reply_queue.take();
+		return line.line;
 	}
 
-	public void add_monitor(LinkedBlockingQueue<String> q) {
+	public void add_monitor(LinkedBlockingQueue<AltosLine> q) {
 		set_monitor(true);
 		monitors.add(q);
 	}
 
-	public void remove_monitor(LinkedBlockingQueue<String> q) {
+	public void remove_monitor(LinkedBlockingQueue<AltosLine> q) {
 		monitors.remove(q);
 		if (monitors.isEmpty())
 			set_monitor(false);
 	}
 
-	public boolean opened() {
-		return altos != null;
-	}
-
 	public void close() {
 		if (altos != null) {
 			libaltos.altos_close(altos);
@@ -155,6 +159,9 @@ public class AltosSerial implements Runnable {
 			libaltos.altos_free(altos);
 			altos = null;
 		}
+		synchronized (devices_opened) {
+			devices_opened.remove(device.getPath());
+		}
 	}
 
 	public void putc(char c) {
@@ -172,7 +179,12 @@ public class AltosSerial implements Runnable {
 		print(String.format(format, arguments));
 	}
 
-	public void open(altos_device device) throws FileNotFoundException {
+	private void open() throws FileNotFoundException, AltosSerialInUseException {
+		synchronized (devices_opened) {
+			if (devices_opened.contains(device.getPath()))
+				throw new AltosSerialInUseException(device);
+			devices_opened.add(device.getPath());
+		}
 		close();
 		altos = libaltos.altos_open(device);
 		if (altos == null)
@@ -180,20 +192,19 @@ public class AltosSerial implements Runnable {
 		input_thread = new Thread(this);
 		input_thread.start();
 		print("~\nE 0\n");
+		flush_output();
 		set_monitor(monitor_mode);
-		flush_input();
+		set_channel(AltosPreferences.channel(device.getSerial()));
+		set_callsign(AltosPreferences.callsign());
 	}
 
 	public void set_channel(int channel) {
 		if (altos != null) {
-			if (monitor_mode) {
-				printf("m 0\n");
-				flush_input();
-			}
-			printf("c r %d\n", channel);
 			if (monitor_mode)
-				printf("m 1\n");
-			flush_input();
+				printf("m 0\nc r %d\nm 1\n", channel);
+			else
+				printf("c r %d\n", channel);
+			flush_output();
 		}
 	}
 
@@ -202,24 +213,25 @@ public class AltosSerial implements Runnable {
 		if (altos != null) {
 			if (monitor)
 				printf("m 1\n");
-			else {
+			else
 				printf("m 0\n");
-				flush_input();
-			}
+			flush_output();
 		}
 	}
 
 	public void set_callsign(String callsign) {
-		if (altos != null)
+		if (altos != null) {
 			printf ("c c %s\n", callsign);
+			flush_output();
+		}
 	}
 
-	public AltosSerial() {
-		altos = null;
-		input_thread = null;
+	public AltosSerial(altos_device in_device) throws FileNotFoundException, AltosSerialInUseException {
+		device = in_device;
 		line = "";
 		monitor_mode = false;
-		monitors = new LinkedList<LinkedBlockingQueue<String>> ();
-		reply_queue = new LinkedBlockingQueue<String> ();
+		monitors = new LinkedList<LinkedBlockingQueue<AltosLine>> ();
+		reply_queue = new LinkedBlockingQueue<AltosLine> ();
+		open();
 	}
 }