use multimaint-merge to make Debian changelogs less ugly

[fw/altos] / altosui / AltosConfig.java

diff --git a/altosui/AltosConfig.java b/altosui/AltosConfig.java
index 84c8a4a307d74528d42ff28af07dbd757be3bd51..122ebeccf88d449800286f569a84026e962a5cfb 100644 (file)
--- a/altosui/AltosConfig.java
+++ b/altosui/AltosConfig.java
@@ -79,11 +79,13 @@ public class AltosConfig implements ActionListener {
        int_ref         storage_size;
        int_ref         storage_erase_unit;
        int_ref         stored_flight;
+       int_ref         radio_enable;
        string_ref      version;
        string_ref      product;
        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)) {
@@ -147,14 +149,28 @@ public class AltosConfig implements ActionListener {
                config_ui.set_apogee_delay(apogee_delay.get());
                config_ui.set_radio_calibration(radio_calibration.get());
                config_ui.set_radio_frequency(frequency());
-               config_ui.set_flight_log_max_enabled(stored_flight.get() < 0);
+               boolean max_enabled = true;
+               switch (log_format.get()) {
+               case Altos.AO_LOG_FORMAT_TINY:
+                       max_enabled = false;
+                       break;
+               default:
+                       if (stored_flight.get() >= 0)
+                               max_enabled = false;
+                       break;
+               }
+               config_ui.set_flight_log_max_enabled(max_enabled);
+               config_ui.set_radio_enable(radio_enable.get());
                config_ui.set_flight_log_max_limit(log_limit());
                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();
+               if (!made_visible) {
+                       made_visible = true;
+                       config_ui.make_visible();
+               }
        }
 
        void process_line(String line) {
@@ -162,7 +178,7 @@ public class AltosConfig implements ActionListener {
                        abort();
                        return;
                }
-               if (line.equals("done")) {
+               if (line.equals("all finished")) {
                        if (serial_line != null)
                                update_ui();
                        return;
@@ -177,6 +193,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, "Radio enable:", radio_enable);
                get_int(line, "Storage size:", storage_size);
                get_int(line, "Storage erase unit:", storage_erase_unit);
                get_int(line, "flight", stored_flight);
@@ -206,10 +223,31 @@ 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_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 {
@@ -231,7 +269,7 @@ public class AltosConfig implements ActionListener {
                                } catch (InterruptedException ie) {
                                }
                        }
-                       callback("done");
+                       callback("all finished");
                }
 
                void save_data() {
@@ -255,6 +293,8 @@ public class AltosConfig implements ActionListener {
                                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 (radio_enable.get() >= 0)
+                                       serial_line.printf("c e %d\n", radio_enable.get());
                                if (ignite_mode.get() >= 0)
                                        serial_line.printf("c i %d\n", ignite_mode.get());
                                if (pad_orientation.get() >= 0)
@@ -373,6 +413,8 @@ public class AltosConfig implements ActionListener {
                radio_calibration.set(config_ui.radio_calibration());
                set_frequency(config_ui.radio_frequency());
                flight_log_max.set(config_ui.flight_log_max());
+               if (radio_enable.get() >= 0)
+                       radio_enable.set(config_ui.radio_enable());
                if (ignite_mode.get() >= 0)
                        ignite_mode.set(config_ui.ignite_mode());
                if (pad_orientation.get() >= 0)
@@ -412,6 +454,7 @@ public class AltosConfig implements ActionListener {
                radio_channel = new int_ref(0);
                radio_setting = new int_ref(0);
                radio_calibration = new int_ref(1186611);
+               radio_enable = new int_ref(-1);
                flight_log_max = new int_ref(0);
                ignite_mode = new int_ref(-1);
                pad_orientation = new int_ref(-1);