Merge branch 'prefs_interface' into altosdroid

[fw/altos] / altosui / AltosConfig.java

diff --git a/altosui/AltosConfig.java b/altosui/AltosConfig.java
index 93def70daaad2e527616da648c4384187d152c95..44e5a3faf4c5265414476cbc0bc31464543c5a4a 100644 (file)
--- a/altosui/AltosConfig.java
+++ b/altosui/AltosConfig.java
@@ -17,18 +17,11 @@
 
 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.*;
 
 public class AltosConfig implements ActionListener {
 
@@ -70,12 +63,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;
@@ -147,6 +142,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;
@@ -187,12 +183,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);
@@ -228,8 +228,10 @@ public class AltosConfig implements ActionListener {
                        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);
@@ -275,19 +277,22 @@ public class AltosConfig implements ActionListener {
                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());
@@ -378,15 +383,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);
@@ -410,6 +420,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());
@@ -451,8 +462,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);
@@ -470,7 +483,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) {
@@ -489,11 +502,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);
                        }
                }
        }