altosui: Configure radio with new direct frequency setting

[fw/altos] / altosui / AltosConfig.java

diff --git a/altosui/AltosConfig.java b/altosui/AltosConfig.java
index f17436083937665984e83f9afd21fa1af9a5b28d..84261ec7a5523753f00387835beadb0da261d719 100644 (file)
--- a/altosui/AltosConfig.java
+++ b/altosui/AltosConfig.java
@@ -76,6 +76,7 @@ public class AltosConfig implements ActionListener {
        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 +86,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)) {
@@ -166,7 +168,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 +179,7 @@ public class AltosConfig implements ActionListener {
                        abort();
                        return;
                }
-               if (line.equals("done")) {
+               if (line.equals("all finished")) {
                        if (serial_line != null)
                                update_ui();
                        return;
@@ -189,6 +194,7 @@ public class AltosConfig implements ActionListener {
                get_int(line, "Ignite mode:", ignite_mode);
                get_int(line, "Pad orientation:", pad_orientation);
                get_int(line, "Radio setting:", radio_setting);
+               get_int(line, "Frequency:", radio_frequency);
                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 +225,32 @@ 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);
+                       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,12 +272,13 @@ 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());
@@ -257,6 +286,7 @@ public class AltosConfig implements ActionListener {
                                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) {
@@ -353,15 +383,19 @@ 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));
+               } else if (setting > 0) {
                        radio_setting.set(AltosConvert.radio_frequency_to_setting(freq,
                                                                                  radio_calibration.get()));
                        radio_channel.set(0);
@@ -428,6 +462,7 @@ public class AltosConfig implements ActionListener {
                apogee_delay = 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);
@@ -455,8 +490,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) {