altosui/altoslib: Add support for configuring pyro channels

[fw/altos] / altosui / AltosConfig.java

diff --git a/altosui/AltosConfig.java b/altosui/AltosConfig.java
index bd9302068ffa6ec853ca0ab72117f2fe0ab2ce15..be9ab8bf6b1f51a1e7a9d3b70b8c7aaf8b76b692 100644 (file)
--- a/altosui/AltosConfig.java
+++ b/altosui/AltosConfig.java
@@ -17,18 +17,12 @@
 
 package altosui;
 
-import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
 import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
 import java.util.concurrent.*;
-
-import libaltosJNI.*;
+import org.altusmetrum.AltosLib.*;
+import java.text.*;
 
 public class AltosConfig implements ActionListener {
 
@@ -85,6 +79,8 @@ public class AltosConfig implements ActionListener {
        string_ref      version;
        string_ref      product;
        string_ref      callsign;
+       int_ref         npyro;
+       AltosPyro[]     pyros;
        AltosConfigUI   config_ui;
        boolean         serial_started;
        boolean         made_visible;
@@ -169,6 +165,8 @@ public class AltosConfig implements ActionListener {
                config_ui.set_ignite_mode(ignite_mode.get());
                config_ui.set_pad_orientation(pad_orientation.get());
                config_ui.set_callsign(callsign.get());
+               config_ui.set_pyros(pyros);
+               config_ui.set_has_pyro(npyro.get() > 0);
                config_ui.set_clean();
                if (!made_visible) {
                        made_visible = true;
@@ -176,6 +174,8 @@ public class AltosConfig implements ActionListener {
                }
        }
 
+       int     pyro;
+
        void process_line(String line) {
                if (line == null) {
                        abort();
@@ -186,6 +186,18 @@ public class AltosConfig implements ActionListener {
                                update_ui();
                        return;
                }
+               if (pyro < npyro.get()) {
+                       if (pyros == null)
+                               pyros = new AltosPyro[npyro.get()];
+
+                       try {
+                               pyros[pyro] = new AltosPyro(pyro, line);
+                       } catch (ParseException e) {
+                               System.out.printf ("pyro parse failed %s\n", line);
+                       }
+                       ++pyro;
+                       return;
+               }
                get_int(line, "serial-number", serial);
                get_int(line, "log-format", log_format);
                get_int(line, "Main deploy:", main_deploy);
@@ -207,6 +219,7 @@ public class AltosConfig implements ActionListener {
                get_string(line, "Callsign:", callsign);
                get_string(line,"software-version", version);
                get_string(line,"product", product);
+               get_int(line, "Pyro-count:", npyro);
        }
 
        final static int        serial_mode_read = 0;
@@ -250,6 +263,8 @@ public class AltosConfig implements ActionListener {
                        callsign.set("N0CALL");
                        version.set("unknown");
                        product.set("unknown");
+                       pyro = 0;
+                       npyro.set(0);
                }
 
                void get_data() {
@@ -311,6 +326,12 @@ public class AltosConfig implements ActionListener {
                                        serial_line.printf("c i %d\n", ignite_mode.get());
                                if (pad_orientation.get() >= 0)
                                        serial_line.printf("c o %d\n", pad_orientation.get());
+                               if (pyros.length > 0) {
+                                       for (int p = 0; p < pyros.length; p++) {
+                                               serial_line.printf("c P %s\n",
+                                                                  pyros[p].toString());
+                                       }
+                               }
                                serial_line.printf("c w\n");
                        } catch (InterruptedException ie) {
                        } catch (TimeoutException te) {
@@ -438,6 +459,9 @@ public class AltosConfig implements ActionListener {
                if (pad_orientation.get() >= 0)
                        pad_orientation.set(config_ui.pad_orientation());
                callsign.set(config_ui.callsign());
+               if (npyro.get() > 0) {
+                       pyros = config_ui.pyros();
+               }
                run_serial_thread(serial_mode_save);
        }
 
@@ -484,13 +508,14 @@ public class AltosConfig implements ActionListener {
                callsign = new string_ref("N0CALL");
                version = new string_ref("unknown");
                product = new string_ref("unknown");
+               npyro = new int_ref(0);
 
                device = AltosDeviceDialog.show(owner, Altos.product_any);
                if (device != null) {
                        try {
                                serial_line = new AltosSerial(device);
                                try {
-                                       if (!device.matchProduct(Altos.product_telemetrum))
+                                       if (!device.matchProduct(Altos.product_altimeter))
                                                remote = true;
                                        init_ui();
                                } catch (InterruptedException ie) {
@@ -509,11 +534,6 @@ public class AltosConfig implements ActionListener {
                                                                            device.toShortString()),
                                                              "Device in use",
                                                              JOptionPane.ERROR_MESSAGE);
-                       } catch (IOException ee) {
-                               JOptionPane.showMessageDialog(owner,
-                                                             device.toShortString(),
-                                                             ee.getLocalizedMessage(),
-                                                             JOptionPane.ERROR_MESSAGE);
                        }
                }
        }