altosui: Move AltosIgnite.java to altoslib
authorKeith Packard <keithp@keithp.com>
Sun, 22 Jul 2012 18:53:44 +0000 (11:53 -0700)
committerKeith Packard <keithp@keithp.com>
Sun, 22 Jul 2012 18:54:17 +0000 (11:54 -0700)
To be shared with altosdroid eventually

Signed-off-by: Keith Packard <keithp@keithp.com>
altoslib/AltosIgnite.java [new file with mode: 0644]
altoslib/Makefile.am
altosui/AltosIgnite.java [deleted file]
altosui/AltosIgniteUI.java
altosui/Makefile.am

diff --git a/altoslib/AltosIgnite.java b/altoslib/AltosIgnite.java
new file mode 100644 (file)
index 0000000..cc81433
--- /dev/null
@@ -0,0 +1,180 @@
+/*
+ * Copyright © 2010 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.AltosLib;
+
+import java.io.*;
+import java.util.concurrent.*;
+
+public class AltosIgnite {
+       AltosLink       link;
+       boolean         remote;
+       boolean         link_started;
+
+       public final static int None = 0;
+       public final static int Apogee = 1;
+       public final static int Main = 2;
+
+       public final static int Unknown = 0;
+       public final static int Ready = 1;
+       public final static int Active = 2;
+       public final static int Open = 3;
+
+       private void start_link() throws InterruptedException, TimeoutException {
+               link_started = true;
+               if (remote)
+                       link.start_remote();
+       }
+
+       private void stop_link() throws InterruptedException {
+               if (!link_started)
+                       return;
+               link_started = false;
+               if (link == null)
+                       return;
+               if (remote)
+                       link.stop_remote();
+       }
+
+       class string_ref {
+               String  value;
+
+               public String get() {
+                       return value;
+               }
+               public void set(String i) {
+                       value = i;
+               }
+               public string_ref() {
+                       value = null;
+               }
+       }
+
+       private boolean get_string(String line, String label, string_ref s) {
+               if (line.startsWith(label)) {
+                       String  quoted = line.substring(label.length()).trim();
+
+                       if (quoted.startsWith("\""))
+                               quoted = quoted.substring(1);
+                       if (quoted.endsWith("\""))
+                               quoted = quoted.substring(0,quoted.length()-1);
+                       s.set(quoted);
+                       return true;
+               } else {
+                       return false;
+               }
+       }
+
+       private int status(String status_name) {
+               if (status_name.equals("unknown"))
+                       return Unknown;
+               if (status_name.equals("ready"))
+                       return Ready;
+               if (status_name.equals("active"))
+                       return Active;
+               if (status_name.equals("open"))
+                       return Open;
+               return Unknown;
+       }
+
+       public int status(int igniter) throws InterruptedException, TimeoutException {
+               int status = Unknown;
+               if (link == null)
+                       return status;
+               string_ref status_name = new string_ref();
+               try {
+                       start_link();
+                       link.printf("t\n");
+                       for (;;) {
+                               String line = link.get_reply(5000);
+                               if (line == null)
+                                       throw new TimeoutException();
+                               String[] items = line.split("\\s+");
+
+                               if (items.length < 4)
+                                       continue;
+
+                               if (!items[0].equals("Igniter:"))
+                                       continue;
+
+                               if (!items[2].equals("Status:"))
+                                       continue;
+
+                               if (items[1].equals("drogue")) {
+                                       if (igniter == Apogee)
+                                               status = status(items[3]);
+                               } else if (items[1].equals("main")) {
+                                       if (igniter == Main)
+                                               status = status(items[3]);
+                                       break;
+                               }
+                       }
+               } finally {
+                       stop_link();
+               }
+               return status;
+       }
+
+       public static String status_string(int status) {
+               switch (status) {
+               case Unknown: return "Unknown";
+               case Ready: return "Ready";
+               case Active: return "Active";
+               case Open: return "Open";
+               default: return "Unknown";
+               }
+       }
+
+       public void fire(int igniter) {
+               if (link == null)
+                       return;
+               try {
+                       start_link();
+                       switch (igniter) {
+                       case Main:
+                               link.printf("i DoIt main\n");
+                               break;
+                       case Apogee:
+                               link.printf("i DoIt drogue\n");
+                               break;
+                       }
+               } catch (InterruptedException ie) {
+               } catch (TimeoutException te) {
+               } finally {
+                       try {
+                               stop_link();
+                       } catch (InterruptedException ie) {
+                       }
+               }
+       }
+
+       public void close() {
+               try {
+                       stop_link();
+               } catch (InterruptedException ie) {
+               }
+               link.close();
+               link = null;
+       }
+
+       public AltosIgnite(AltosLink in_link, boolean in_remote)
+               throws FileNotFoundException, TimeoutException, InterruptedException {
+
+               link = in_link;
+               remote = in_remote;
+       }
+}
\ No newline at end of file
index a39623ee4defeeab664397bb9b6597bce55f2119..1f42140b1d9f1785da70a977b853a6a41a19ee55 100644 (file)
@@ -29,6 +29,7 @@ AltosLib_JAVA = \
        $(SRC)/AltosGreatCircle.java \
        $(SRC)/AltosIdleMonitor.java \
        $(SRC)/AltosIdleMonitorListener.java \
+       $(SRC)/AltosIgnite.java \
        $(SRC)/AltosLine.java \
        $(SRC)/AltosLink.java \
        $(SRC)/AltosLog.java \
diff --git a/altosui/AltosIgnite.java b/altosui/AltosIgnite.java
deleted file mode 100644 (file)
index f84db0b..0000000
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright © 2010 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package altosui;
-
-import java.io.*;
-import java.util.concurrent.*;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import javax.swing.event.*;
-import org.altusmetrum.AltosLib.*;
-
-public class AltosIgnite {
-       AltosDevice     device;
-       AltosSerial     serial;
-       boolean         remote;
-       boolean         serial_started;
-       final static int        None = 0;
-       final static int        Apogee = 1;
-       final static int        Main = 2;
-
-       final static int        Unknown = 0;
-       final static int        Ready = 1;
-       final static int        Active = 2;
-       final static int        Open = 3;
-
-       private void start_serial() throws InterruptedException, TimeoutException {
-               serial_started = true;
-               if (remote)
-                       serial.start_remote();
-       }
-
-       private void stop_serial() throws InterruptedException {
-               if (!serial_started)
-                       return;
-               serial_started = false;
-               if (serial == null)
-                       return;
-               if (remote)
-                       serial.stop_remote();
-       }
-
-       class string_ref {
-               String  value;
-
-               public String get() {
-                       return value;
-               }
-               public void set(String i) {
-                       value = i;
-               }
-               public string_ref() {
-                       value = null;
-               }
-       }
-
-       private boolean get_string(String line, String label, string_ref s) {
-               if (line.startsWith(label)) {
-                       String  quoted = line.substring(label.length()).trim();
-
-                       if (quoted.startsWith("\""))
-                               quoted = quoted.substring(1);
-                       if (quoted.endsWith("\""))
-                               quoted = quoted.substring(0,quoted.length()-1);
-                       s.set(quoted);
-                       return true;
-               } else {
-                       return false;
-               }
-       }
-
-       private int status(String status_name) {
-               if (status_name.equals("unknown"))
-                       return Unknown;
-               if (status_name.equals("ready"))
-                       return Ready;
-               if (status_name.equals("active"))
-                       return Active;
-               if (status_name.equals("open"))
-                       return Open;
-               return Unknown;
-       }
-
-       public int status(int igniter) throws InterruptedException, TimeoutException {
-               int status = Unknown;
-               if (serial == null)
-                       return status;
-               string_ref status_name = new string_ref();
-               try {
-                       start_serial();
-                       serial.printf("t\n");
-                       for (;;) {
-                               String line = serial.get_reply(5000);
-                               if (line == null)
-                                       throw new TimeoutException();
-                               String[] items = line.split("\\s+");
-
-                               if (items.length < 4)
-                                       continue;
-
-                               if (!items[0].equals("Igniter:"))
-                                       continue;
-
-                               if (!items[2].equals("Status:"))
-                                       continue;
-
-                               if (items[1].equals("drogue")) {
-                                       if (igniter == Apogee)
-                                               status = status(items[3]);
-                               } else if (items[1].equals("main")) {
-                                       if (igniter == Main)
-                                               status = status(items[3]);
-                                       break;
-                               }
-                       }
-               } finally {
-                       stop_serial();
-               }
-               return status;
-       }
-
-       public static String status_string(int status) {
-               switch (status) {
-               case Unknown: return "Unknown";
-               case Ready: return "Ready";
-               case Active: return "Active";
-               case Open: return "Open";
-               default: return "Unknown";
-               }
-       }
-
-       public void fire(int igniter) {
-               if (serial == null)
-                       return;
-               try {
-                       start_serial();
-                       switch (igniter) {
-                       case Main:
-                               serial.printf("i DoIt main\n");
-                               break;
-                       case Apogee:
-                               serial.printf("i DoIt drogue\n");
-                               break;
-                       }
-               } catch (InterruptedException ie) {
-               } catch (TimeoutException te) {
-               } finally {
-                       try {
-                               stop_serial();
-                       } catch (InterruptedException ie) {
-                       }
-               }
-       }
-
-       public void close() {
-               try {
-                       stop_serial();
-               } catch (InterruptedException ie) {
-               }
-               serial.close();
-               serial = null;
-       }
-
-       public void set_frame(Frame frame) {
-               serial.set_frame(frame);
-       }
-
-       public AltosIgnite(AltosDevice in_device)
-               throws FileNotFoundException, AltosSerialInUseException, TimeoutException, InterruptedException {
-
-               device = in_device;
-               serial = new AltosSerial(device);
-               remote = false;
-
-               if (!device.matchProduct(Altos.product_altimeter))
-                       remote = true;
-       }
-}
\ No newline at end of file
index 076d99b209d537ded052eaf6257ca6c982e87705..78eba8e66bec1d9473c951335a82455e5edf6371 100644 (file)
@@ -72,12 +72,15 @@ public class AltosIgniteUI
 
                public void run () {
                        try {
-                               ignite = new AltosIgnite(device);
+                               AltosSerial     serial = new AltosSerial(device);
+                               serial.set_frame(owner);
+                               ignite = new AltosIgnite(serial,
+                                                        !device.matchProduct(Altos.product_altimeter));
+
                        } catch (Exception e) {
                                send_exception(e);
                                return;
                        }
-                       ignite.set_frame(owner);
 
                        for (;;) {
                                Runnable        r;
index 1c8ea491b3ab842d781940b33acae4dcbca380a5..19db66980cb8f2f8a94665e0133936325c1882c0 100644 (file)
@@ -55,7 +55,6 @@ altosui_JAVA = \
        AltosHexfile.java \
        Altos.java \
        AltosIdleMonitorUI.java \
-       AltosIgnite.java \
        AltosIgniteUI.java \
        AltosLaunch.java \
        AltosLaunchUI.java \