Reverted package name to 'altosui' from 'AltosUI'

[fw/altos] / altosui / AltosConfig.java

diff --git a/altosui/AltosConfig.java b/altosui/AltosConfig.java
index 8eb71e1f8bb3b3d380ae3e2fa8e8426ddf987b3f..cae41858d93525c851791b174b43e61378eaba70 100644 (file)
--- a/altosui/AltosConfig.java
+++ b/altosui/AltosConfig.java
@@ -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,6 +71,7 @@ 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;
@@ -148,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;
@@ -188,6 +191,7 @@ 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);
@@ -232,6 +236,7 @@ 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);
@@ -285,6 +290,7 @@ public class AltosConfig implements ActionListener {
                                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,
@@ -294,7 +300,7 @@ public class AltosConfig implements ActionListener {
                                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());
@@ -397,6 +403,7 @@ public class AltosConfig implements ActionListener {
 
                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()));
@@ -421,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());
@@ -462,6 +470,7 @@ 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);
@@ -482,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) {