Switch AltosUI to libaltos for device access

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

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index 43c40799f193552ba66d2dbbd74b1b52c9d140ad..33ed2c90b19d791725b947dd343c1aab763d36a8 100644 (file)
--- a/ao-tools/altosui/AltosUI.java
+++ b/ao-tools/altosui/AltosUI.java
@@ -27,7 +27,6 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.LinkedBlockingQueue;
-import gnu.io.*;
 
 import altosui.AltosSerial;
 import altosui.AltosSerialMonitor;
@@ -38,6 +37,8 @@ import altosui.AltosPreferences;
 import altosui.AltosLog;
 import altosui.AltosVoice;
 
+import libaltosJNI.*;
+
 class AltosFlightStatusTableModel extends AbstractTableModel {
        private String[] columnNames = {"Height (m)", "State", "RSSI (dBm)", "Speed (m/s)" };
        private Object[] data = { 0, "idle", 0, 0 };
@@ -475,31 +476,21 @@ public class AltosUI extends JFrame {
        }
 
        private void ConnectToDevice() {
-               AltosDevice     device = AltosDeviceDialog.show(AltosUI.this, "TeleDongle");
+               altos_device    device = AltosDeviceDialog.show(AltosUI.this, "TeleDongle");
 
                if (device != null) {
                        try {
-                               serial_line.connect(device.tty);
+                               serial_line.open(device);
                                DeviceThread thread = new DeviceThread(serial_line);
                                run_display(thread);
                        } catch (FileNotFoundException ee) {
                                JOptionPane.showMessageDialog(AltosUI.this,
-                                                             device.tty,
+                                                             device.getPath(),
                                                              "Cannot open serial port",
                                                              JOptionPane.ERROR_MESSAGE);
-                       } catch (NoSuchPortException ee) {
-                               JOptionPane.showMessageDialog(AltosUI.this,
-                                                             device.tty,
-                                                             "No such serial port",
-                                                             JOptionPane.ERROR_MESSAGE);
-                       } catch (PortInUseException ee) {
-                               JOptionPane.showMessageDialog(AltosUI.this,
-                                                             device.tty,
-                                                             "Port in use",
-                                                             JOptionPane.ERROR_MESSAGE);
                        } catch (IOException ee) {
                                JOptionPane.showMessageDialog(AltosUI.this,
-                                                             device.tty,
+                                                             device.getPath(),
                                                              "Unkonwn I/O error",
                                                              JOptionPane.ERROR_MESSAGE);
                        }