altosui: Catch errors opening USB devices. Limit list to relevant devices

[fw/altos] / ao-tools / altosui / AltosSerial.java

diff --git a/ao-tools/altosui/AltosSerial.java b/ao-tools/altosui/AltosSerial.java
index 03ab28c55376ff635c4c7b964304f0ab7cd1b269..b016c1d65fbecfe0463c0e97933148cf10c2d55b 100644 (file)
--- a/ao-tools/altosui/AltosSerial.java
+++ b/ao-tools/altosui/AltosSerial.java
@@ -26,16 +26,21 @@ import java.io.*;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.LinkedList;
 import java.util.Iterator;
-import gnu.io.*;
 import altosui.AltosSerialMonitor;
+import libaltosJNI.libaltos;
+import libaltosJNI.altos_device;
+import libaltosJNI.SWIGTYPE_p_altos_file;
+import libaltosJNI.SWIGTYPE_p_altos_list;
 
 /*
  * This class reads from the serial port and places each received
  * line in a queue. Dealing with that queue is left up to other
  * threads.
  */
-class AltosSerialReader implements Runnable {
-       InputStream     serial_in;
+
+public class AltosSerial implements Runnable {
+
+       SWIGTYPE_p_altos_file altos;
        LinkedList<LinkedBlockingQueue<String>> monitors;
        LinkedBlockingQueue<String> reply_queue;
        Thread input_thread;
@@ -46,7 +51,7 @@ class AltosSerialReader implements Runnable {
 
                try {
                        for (;;) {
-                               c = serial_in.read();
+                               c = libaltos.altos_getchar(altos, 0);
                                if (Thread.interrupted())
                                        break;
                                if (c == -1)
@@ -70,7 +75,6 @@ class AltosSerialReader implements Runnable {
                                        }
                                }
                        }
-               } catch (IOException e) {
                } catch (InterruptedException e) {
                }
        }
@@ -96,16 +100,13 @@ class AltosSerialReader implements Runnable {
        }
 
        public boolean opened() {
-               return serial_in != null;
+               return altos != null;
        }
 
        public void close() {
-               if (serial_in != null) {
-                       try {
-                               serial_in.close();
-                       } catch (IOException e) {
-                       }
-                       serial_in = null;
+               if (altos != null) {
+                       libaltos.altos_close(altos);
+                       altos = null;
                }
                if (input_thread != null) {
                        try {
@@ -117,87 +118,33 @@ class AltosSerialReader implements Runnable {
                }
        }
 
-       public void open(File name) throws FileNotFoundException {
-               close();
-               serial_in = new FileInputStream(name);
-               input_thread = new Thread(this);
-               input_thread.start();
-       }
-       public void open(CommPort c) throws IOException {
-               close();
-               try {
-               c.enableReceiveTimeout(1000);   /* icky. the read method cannot be interrupted */
-               } catch (UnsupportedCommOperationException ee) {
-               }
-               serial_in = c.getInputStream();
-               input_thread = new Thread(this);
-               input_thread.start();
-       }
-       public AltosSerialReader () {
-               serial_in = null;
-               input_thread = null;
-               line = "";
-               monitors = new LinkedList<LinkedBlockingQueue<String>> ();
-               reply_queue = new LinkedBlockingQueue<String> ();
+       public void putc(char c) {
+               libaltos.altos_putchar(altos, c);
        }
 
-}
-
-public class AltosSerial {
-       OutputStream serial_out = null;
-       AltosSerialReader reader = null;
-
-       CommPort comm_port = null;
-
-       public void close() {
-               try {
-                       serial_out.close();
-               } catch (IOException ee) {
-               }
-               reader.close();
-               if (comm_port != null) {
-                       comm_port.close();
-               }
-       }
-
-       public void open(File serial_name) throws FileNotFoundException {
-               reader.open(serial_name);
-               serial_out = new FileOutputStream(serial_name);
-       }
-
-       public void open(CommPort c) throws IOException {
-               reader.open(c);
-               serial_out = c.getOutputStream();
+       public void print(String data) {
+               for (int i = 0; i < data.length(); i++)
+                       putc(data.charAt(i));
        }
 
-       public void connect(String port_name) throws IOException, NoSuchPortException, PortInUseException {
-               comm_port = new RXTXPort(port_name);
-               open(comm_port);
+       public void printf(String format, Object ... arguments) {
+               print(String.format(format, arguments));
        }
 
-       void init() {
-               reader = new AltosSerialReader();
-       }
-
-       public void add_monitor(LinkedBlockingQueue<String> q) {
-               reader.add_monitor(q);
-       }
-
-       public void remove_monitor(LinkedBlockingQueue<String> q) {
-               reader.remove_monitor(q);
+       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();
        }
 
        public AltosSerial() {
-               init();
-       }
-
-       public AltosSerial(File serial_name) throws FileNotFoundException {
-               init();
-               open(serial_name);
-       }
-
-       public AltosSerial(CommPort comm_port) throws IOException {
-               init();
-               open(comm_port);
+               altos = null;
+               input_thread = null;
+               line = "";
+               monitors = new LinkedList<LinkedBlockingQueue<String>> ();
+               reply_queue = new LinkedBlockingQueue<String> ();
        }
 }