Reverted package name to 'altosui' from 'AltosUI'
[fw/altos] / altosui / AltosConfig.java
index f17436083937665984e83f9afd21fa1af9a5b28d..cae41858d93525c851791b174b43e61378eaba70 100644 (file)
@@ -27,6 +27,7 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.*;
+import org.altusmetrum.AltosLib.*;
 
 import libaltosJNI.*;
 
@@ -70,12 +71,14 @@ public class AltosConfig implements ActionListener {
        int_ref         log_format;
        int_ref         main_deploy;
        int_ref         apogee_delay;
+       int_ref         apogee_lockout;
        int_ref         radio_channel;
        int_ref         radio_calibration;
        int_ref         flight_log_max;
        int_ref         ignite_mode;
        int_ref         pad_orientation;
        int_ref         radio_setting;
+       int_ref         radio_frequency;
        int_ref         storage_size;
        int_ref         storage_erase_unit;
        int_ref         stored_flight;
@@ -85,6 +88,7 @@ public class AltosConfig implements ActionListener {
        string_ref      callsign;
        AltosConfigUI   config_ui;
        boolean         serial_started;
+       boolean         made_visible;
 
        boolean get_int(String line, String label, int_ref x) {
                if (line.startsWith(label)) {
@@ -146,6 +150,7 @@ public class AltosConfig implements ActionListener {
                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_apogee_lockout(apogee_lockout.get());
                config_ui.set_radio_calibration(radio_calibration.get());
                config_ui.set_radio_frequency(frequency());
                boolean max_enabled = true;
@@ -166,7 +171,10 @@ public class AltosConfig implements ActionListener {
                config_ui.set_pad_orientation(pad_orientation.get());
                config_ui.set_callsign(callsign.get());
                config_ui.set_clean();
-               config_ui.make_visible();
+               if (!made_visible) {
+                       made_visible = true;
+                       config_ui.make_visible();
+               }
        }
 
        void process_line(String line) {
@@ -174,7 +182,7 @@ public class AltosConfig implements ActionListener {
                        abort();
                        return;
                }
-               if (line.equals("done")) {
+               if (line.equals("all finished")) {
                        if (serial_line != null)
                                update_ui();
                        return;
@@ -183,12 +191,16 @@ public class AltosConfig implements ActionListener {
                get_int(line, "log-format", log_format);
                get_int(line, "Main deploy:", main_deploy);
                get_int(line, "Apogee delay:", apogee_delay);
+               get_int(line, "Apogee lockout:", apogee_lockout);
                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_int(line, "Radio setting:", radio_setting);
+               if (get_int(line, "Frequency:", radio_frequency))
+                       if (radio_frequency.get() < 0)
+                               radio_frequency.set(434550);
                get_int(line, "Radio enable:", radio_enable);
                get_int(line, "Storage size:", storage_size);
                get_int(line, "Storage erase unit:", storage_erase_unit);
@@ -219,10 +231,33 @@ public class AltosConfig implements ActionListener {
                        SwingUtilities.invokeLater(r);
                }
 
+               void reset_data() {
+                       serial.set(0);
+                       log_format.set(Altos.AO_LOG_FORMAT_UNKNOWN);
+                       main_deploy.set(250);
+                       apogee_delay.set(0);
+                       apogee_lockout.set(0);
+                       radio_channel.set(0);
+                       radio_setting.set(0);
+                       radio_frequency.set(0);
+                       radio_calibration.set(1186611);
+                       radio_enable.set(-1);
+                       flight_log_max.set(0);
+                       ignite_mode.set(-1);
+                       pad_orientation.set(-1);
+                       storage_size.set(-1);
+                       storage_erase_unit.set(-1);
+                       stored_flight.set(-1);
+                       callsign.set("N0CALL");
+                       version.set("unknown");
+                       product.set("unknown");
+               }
+
                void get_data() {
                        try {
                                config.start_serial();
-                               stored_flight.set(-1);
+                               reset_data();
+
                                config.serial_line.printf("c s\nf\nl\nv\n");
                                for (;;) {
                                        try {
@@ -244,25 +279,28 @@ public class AltosConfig implements ActionListener {
                                } catch (InterruptedException ie) {
                                }
                        }
-                       callback("done");
+                       callback("all finished");
                }
 
                void save_data() {
                        try {
                                double frequency = frequency();
+                               boolean has_frequency = radio_frequency.get() > 0;
                                boolean has_setting = radio_setting.get() > 0;
                                start_serial();
                                serial_line.printf("c m %d\n", main_deploy.get());
                                serial_line.printf("c d %d\n", apogee_delay.get());
+                               serial_line.printf("c L %d\n", apogee_lockout.get());
                                if (!remote)
                                        serial_line.printf("c f %d\n", radio_calibration.get());
                                serial_line.set_radio_frequency(frequency,
+                                                               has_frequency,
                                                                has_setting,
                                                                radio_calibration.get());
                                if (remote) {
                                        serial_line.stop_remote();
                                        serial_line.set_radio_frequency(frequency);
-                                       AltosPreferences.set_frequency(device.getSerial(), frequency);
+                                       AltosUIPreferences.set_frequency(device.getSerial(), frequency);
                                        serial_line.start_remote();
                                }
                                serial_line.printf("c c %s\n", callsign.get());
@@ -353,15 +391,20 @@ public class AltosConfig implements ActionListener {
        }
 
        double frequency() {
-               return AltosConvert.radio_to_frequency(radio_setting.get(),
+               return AltosConvert.radio_to_frequency(radio_frequency.get(),
+                                                      radio_setting.get(),
                                                       radio_calibration.get(),
                                                       radio_channel.get());
        }
 
        void set_frequency(double freq) {
+               int     frequency = radio_frequency.get();
                int     setting = radio_setting.get();
 
-               if (setting > 0) {
+               if (frequency > 0) {
+                       radio_frequency.set((int) Math.floor (freq * 1000 + 0.5));
+                       radio_channel.set(0);
+               } else if (setting > 0) {
                        radio_setting.set(AltosConvert.radio_frequency_to_setting(freq,
                                                                                  radio_calibration.get()));
                        radio_channel.set(0);
@@ -385,6 +428,7 @@ public class AltosConfig implements ActionListener {
 
                main_deploy.set(config_ui.main_deploy());
                apogee_delay.set(config_ui.apogee_delay());
+               apogee_lockout.set(config_ui.apogee_lockout());
                radio_calibration.set(config_ui.radio_calibration());
                set_frequency(config_ui.radio_frequency());
                flight_log_max.set(config_ui.flight_log_max());
@@ -426,8 +470,10 @@ public class AltosConfig implements ActionListener {
                log_format = new int_ref(Altos.AO_LOG_FORMAT_UNKNOWN);
                main_deploy = new int_ref(250);
                apogee_delay = new int_ref(0);
+               apogee_lockout = new int_ref(0);
                radio_channel = new int_ref(0);
                radio_setting = new int_ref(0);
+               radio_frequency = new int_ref(0);
                radio_calibration = new int_ref(1186611);
                radio_enable = new int_ref(-1);
                flight_log_max = new int_ref(0);
@@ -445,7 +491,7 @@ public class AltosConfig implements ActionListener {
                        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) {
@@ -455,8 +501,7 @@ public class AltosConfig implements ActionListener {
                                }
                        } catch (FileNotFoundException ee) {
                                JOptionPane.showMessageDialog(owner,
-                                                             String.format("Cannot open device \"%s\"",
-                                                                           device.toShortString()),
+                                                             ee.getMessage(),
                                                              "Cannot open target device",
                                                              JOptionPane.ERROR_MESSAGE);
                        } catch (AltosSerialInUseException si) {