altos/altosui: Add pad orientation configure option
[fw/altos] / altosui / AltosConfig.java
index 1c42870f8d7ff61519a2df97b9eb88404cfab6cd..04d75528c8219bcae8cf42cd00c8497d008ccc86 100644 (file)
@@ -30,7 +30,7 @@ import java.util.concurrent.*;
 
 import libaltosJNI.*;
 
-public class AltosConfig implements Runnable, ActionListener {
+public class AltosConfig implements ActionListener {
 
        class int_ref {
                int     value;
@@ -64,12 +64,14 @@ public class AltosConfig implements Runnable, ActionListener {
        AltosDevice     device;
        AltosSerial     serial_line;
        boolean         remote;
-       Thread          config_thread;
        int_ref         serial;
        int_ref         main_deploy;
        int_ref         apogee_delay;
        int_ref         radio_channel;
        int_ref         radio_calibration;
+       int_ref         flight_log_max;
+       int_ref         ignite_mode;
+       int_ref         pad_orientation;
        string_ref      version;
        string_ref      product;
        string_ref      callsign;
@@ -109,84 +111,201 @@ public class AltosConfig implements Runnable, ActionListener {
 
        void start_serial() throws InterruptedException {
                serial_started = true;
-               if (remote) {
-                       serial_line.set_radio();
-                       serial_line.printf("p\nE 0\n");
-                       serial_line.flush_input();
-               }
+               if (remote)
+                       serial_line.start_remote();
        }
 
        void stop_serial() throws InterruptedException {
                if (!serial_started)
                        return;
                serial_started = false;
-               if (remote) {
-                       serial_line.printf("~");
-                       serial_line.flush_output();
+               if (remote)
+                       serial_line.stop_remote();
+       }
+
+       void update_ui() {
+               config_ui.set_serial(serial.get());
+               config_ui.set_product(product.get());
+               config_ui.set_version(version.get());
+               config_ui.set_main_deploy(main_deploy.get());
+               config_ui.set_apogee_delay(apogee_delay.get());
+               config_ui.set_radio_channel(radio_channel.get());
+               config_ui.set_radio_calibration(radio_calibration.get());
+               config_ui.set_flight_log_max(flight_log_max.get());
+               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_clean();
+               config_ui.make_visible();
+       }
+
+       void process_line(String line) {
+               if (line == null) {
+                       abort();
+                       return;
+               }
+               if (line.equals("done")) {
+                       if (serial_line != null)
+                               update_ui();
+                       return;
                }
+               get_int(line, "serial-number", serial);
+               get_int(line, "Main deploy:", main_deploy);
+               get_int(line, "Apogee delay:", apogee_delay);
+               get_int(line, "Radio channel:", radio_channel);
+               get_int(line, "Radio cal:", radio_calibration);
+               get_int(line, "Max flight log:", flight_log_max);
+               get_int(line, "Ignite mode:", ignite_mode);
+               get_int(line, "Pad orientation:", pad_orientation);
+               get_string(line, "Callsign:", callsign);
+               get_string(line,"software-version", version);
+               get_string(line,"product", product);
        }
 
-       void get_data() throws InterruptedException, TimeoutException {
-               try {
-                       start_serial();
-                       serial_line.printf("c s\nv\n");
-                       for (;;) {
-                               String line = serial_line.get_reply(5000);
-                               if (line == null)
-                                       throw new TimeoutException();
-                               get_int(line, "serial-number", serial);
-                               get_int(line, "Main deploy:", main_deploy);
-                               get_int(line, "Apogee delay:", apogee_delay);
-                               get_int(line, "Radio channel:", radio_channel);
-                               get_int(line, "Radio cal:", radio_calibration);
-                               get_string(line, "Callsign:", callsign);
-                               get_string(line,"software-version", version);
-                               get_string(line,"product", product);
-
-                               /* signals the end of the version info */
-                               if (line.startsWith("software-version"))
-                                       break;
+       final static int        serial_mode_read = 0;
+       final static int        serial_mode_save = 1;
+       final static int        serial_mode_reboot = 2;
+
+       class SerialData implements Runnable {
+               AltosConfig     config;
+               int             serial_mode;
+
+               void process_line(String line) {
+                       config.process_line(line);
+               }
+               void callback(String in_line) {
+                       final String line = in_line;
+                       Runnable r = new Runnable() {
+                                       public void run() {
+                                               process_line(line);
+                                       }
+                               };
+                       SwingUtilities.invokeLater(r);
+               }
+
+               void get_data() {
+                       try {
+                               config.start_serial();
+                               config.serial_line.printf("c s\nv\n");
+                               for (;;) {
+                                       try {
+                                               String line = config.serial_line.get_reply(5000);
+                                               if (line == null)
+                                                       stop_serial();
+                                               callback(line);
+                                               if (line.startsWith("software-version"))
+                                                       break;
+                                       } catch (Exception e) {
+                                               break;
+                                       }
+                               }
+                       } catch (InterruptedException ie) {
+                       } finally {
+                               try {
+                                       stop_serial();
+                               } catch (InterruptedException ie) {
+                               }
                        }
-               } finally {
-                       stop_serial();
+                       callback("done");
                }
+
+               void save_data() {
+                       try {
+                               int     channel;
+                               start_serial();
+                               serial_line.printf("c m %d\n", main_deploy.get());
+                               serial_line.printf("c d %d\n", apogee_delay.get());
+                               channel = radio_channel.get();
+                               serial_line.printf("c r %d\n", channel);
+                               if (remote) {
+                                       serial_line.stop_remote();
+                                       serial_line.set_channel(channel);
+                                       AltosPreferences.set_channel(device.getSerial(), channel);
+                                       serial_line.start_remote();
+                               }
+                               if (!remote)
+                                       serial_line.printf("c f %d\n", radio_calibration.get());
+                               serial_line.printf("c c %s\n", callsign.get());
+                               if (flight_log_max.get() != 0)
+                                       serial_line.printf("c l %d\n", flight_log_max.get());
+                               if (ignite_mode.get() >= 0)
+                                       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());
+                               serial_line.printf("c w\n");
+                       } catch (InterruptedException ie) {
+                       } finally {
+                               try {
+                                       stop_serial();
+                               } catch (InterruptedException ie) {
+                               }
+                       }
+               }
+
+               void reboot() {
+                       try {
+                               start_serial();
+                               serial_line.printf("r eboot\n");
+                               serial_line.flush_output();
+                       } catch (InterruptedException ie) {
+                       } finally {
+                               try {
+                                       stop_serial();
+                               } catch (InterruptedException ie) {
+                               }
+                               serial_line.close();
+                       }
+               }
+
+               public void run () {
+                       switch (serial_mode) {
+                       case serial_mode_save:
+                               save_data();
+                               /* fall through ... */
+                       case serial_mode_read:
+                               get_data();
+                               break;
+                       case serial_mode_reboot:
+                               reboot();
+                               break;
+                       }
+               }
+
+               public SerialData(AltosConfig in_config, int in_serial_mode) {
+                       config = in_config;
+                       serial_mode = in_serial_mode;
+               }
+       }
+
+       void run_serial_thread(int serial_mode) {
+               SerialData      sd = new SerialData(this, serial_mode);
+               Thread          st = new Thread(sd);
+               st.start();
        }
 
        void init_ui () throws InterruptedException, TimeoutException {
                config_ui = new AltosConfigUI(owner, remote);
                config_ui.addActionListener(this);
+               serial_line.set_frame(owner);
                set_ui();
        }
 
        void abort() {
+               serial_line.close();
+               serial_line = null;
                JOptionPane.showMessageDialog(owner,
                                              String.format("Connection to \"%s\" failed",
                                                            device.toShortString()),
                                              "Connection Failed",
                                              JOptionPane.ERROR_MESSAGE);
-               try {
-                       stop_serial();
-               } catch (InterruptedException ie) {
-               }
-               serial_line.close();
-               serial_line = null;
+               config_ui.setVisible(false);
        }
 
        void set_ui() throws InterruptedException, TimeoutException {
                if (serial_line != null)
-                       get_data();
-               config_ui.set_serial(serial.get());
-               config_ui.set_product(product.get());
-               config_ui.set_version(version.get());
-               config_ui.set_main_deploy(main_deploy.get());
-               config_ui.set_apogee_delay(apogee_delay.get());
-               config_ui.set_radio_channel(radio_channel.get());
-               config_ui.set_radio_calibration(radio_calibration.get());
-               config_ui.set_callsign(callsign.get());
-               config_ui.set_clean();
-       }
-
-       void run_dialog() {
+                       run_serial_thread(serial_mode_read);
+               else
+                       update_ui();
        }
 
        void save_data() {
@@ -194,24 +313,11 @@ public class AltosConfig implements Runnable, ActionListener {
                apogee_delay.set(config_ui.apogee_delay());
                radio_channel.set(config_ui.radio_channel());
                radio_calibration.set(config_ui.radio_calibration());
+               flight_log_max.set(config_ui.flight_log_max());
+               ignite_mode.set(config_ui.ignite_mode());
+               pad_orientation.set(config_ui.pad_orientation());
                callsign.set(config_ui.callsign());
-               try {
-                       start_serial();
-                       serial_line.printf("c m %d\n", main_deploy.get());
-                       serial_line.printf("c d %d\n", apogee_delay.get());
-                       if (!remote) {
-                               serial_line.printf("c r %d\n", radio_channel.get());
-                               serial_line.printf("c f %d\n", radio_calibration.get());
-                       }
-                       serial_line.printf("c c %s\n", callsign.get());
-                       serial_line.printf("c w\n");
-               } catch (InterruptedException ie) {
-               } finally {
-                       try {
-                               stop_serial();
-                       } catch (InterruptedException ie) {
-                       }
-               }
+               run_serial_thread(serial_mode_save);
        }
 
        public void actionPerformed(ActionEvent e) {
@@ -219,17 +325,11 @@ public class AltosConfig implements Runnable, ActionListener {
                try {
                        if (cmd.equals("Save")) {
                                save_data();
-                               set_ui();
                        } else if (cmd.equals("Reset")) {
                                set_ui();
                        } else if (cmd.equals("Reboot")) {
-                               if (serial_line != null) {
-                                       start_serial();
-                                       serial_line.printf("r eboot\n");
-                                       serial_line.flush_output();
-                                       stop_serial();
-                                       serial_line.close();
-                               }
+                               if (serial_line != null)
+                                       run_serial_thread(serial_mode_reboot);
                        } else if (cmd.equals("Close")) {
                                if (serial_line != null)
                                        serial_line.close();
@@ -241,17 +341,6 @@ public class AltosConfig implements Runnable, ActionListener {
                }
        }
 
-       public void run () {
-               try {
-                       init_ui();
-                       config_ui.make_visible();
-               } catch (InterruptedException ie) {
-                       abort();
-               } catch (TimeoutException te) {
-                       abort();
-               }
-       }
-
        public AltosConfig(JFrame given_owner) {
                owner = given_owner;
 
@@ -260,18 +349,26 @@ public class AltosConfig implements Runnable, ActionListener {
                apogee_delay = new int_ref(0);
                radio_channel = new int_ref(0);
                radio_calibration = new int_ref(1186611);
+               flight_log_max = new int_ref(0);
+               ignite_mode = new int_ref(-1);
+               pad_orientation = new int_ref(-1);
                callsign = new string_ref("N0CALL");
                version = new string_ref("unknown");
                product = new string_ref("unknown");
 
-               device = AltosDeviceDialog.show(owner, AltosDevice.product_any);
+               device = AltosDeviceDialog.show(owner, Altos.product_any);
                if (device != null) {
                        try {
                                serial_line = new AltosSerial(device);
-                               if (!device.matchProduct(AltosDevice.product_telemetrum))
+                               if (!device.matchProduct(Altos.product_telemetrum))
                                        remote = true;
-                               config_thread = new Thread(this);
-                               config_thread.start();
+                               try {
+                                       init_ui();
+                               } catch (InterruptedException ie) {
+                                       abort();
+                               } catch (TimeoutException te) {
+                                       abort();
+                               }
                        } catch (FileNotFoundException ee) {
                                JOptionPane.showMessageDialog(owner,
                                                              String.format("Cannot open device \"%s\"",