altosui/telegps: Change from variable-units snuck into master
[fw/altos] / altosui / AltosConfigUI.java
index 2a9d727d7fdfb9158d36cc675d85aafd45069c6e..67decaa4f589e4e07cca3845763ae0392e1424c2 100644 (file)
@@ -21,8 +21,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.altoslib_4.*;
-import org.altusmetrum.altosuilib_2.*;
+import org.altusmetrum.altoslib_6.*;
+import org.altusmetrum.altosuilib_6.*;
 
 public class AltosConfigUI
        extends AltosUIDialog
@@ -40,14 +40,17 @@ public class AltosConfigUI
        JLabel                  radio_calibration_label;
        JLabel                  radio_frequency_label;
        JLabel                  radio_enable_label;
+       JLabel                  rate_label;
        JLabel                  aprs_interval_label;
+       JLabel                  aprs_ssid_label;
+       JLabel                  aprs_format_label;
        JLabel                  flight_log_max_label;
        JLabel                  ignite_mode_label;
        JLabel                  pad_orientation_label;
        JLabel                  callsign_label;
        JLabel                  beep_label;
-       JLabel                  tracker_horiz_label;
-       JLabel                  tracker_vert_label;
+       JLabel                  tracker_motion_label;
+       JLabel                  tracker_interval_label;
 
        public boolean          dirty;
 
@@ -58,17 +61,20 @@ public class AltosConfigUI
        JComboBox<String>       main_deploy_value;
        JComboBox<String>       apogee_delay_value;
        JComboBox<String>       apogee_lockout_value;
-       AltosFreqList           radio_frequency_value;
+       AltosUIFreqList         radio_frequency_value;
        JTextField              radio_calibration_value;
        JRadioButton            radio_enable_value;
+       AltosUIRateList         rate_value;
        JComboBox<String>       aprs_interval_value;
+       JComboBox<Integer>      aprs_ssid_value;
+       JComboBox<String>       aprs_format_value;
        JComboBox<String>       flight_log_max_value;
        JComboBox<String>       ignite_mode_value;
        JComboBox<String>       pad_orientation_value;
        JTextField              callsign_value;
        JComboBox<String>       beep_value;
-       JComboBox<String>       tracker_horiz_value;
-       JComboBox<String>       tracker_vert_value;
+       JComboBox<String>       tracker_motion_value;
+       JComboBox<String>       tracker_interval_value;
 
        JButton                 pyro;
 
@@ -78,6 +84,7 @@ public class AltosConfigUI
        JButton                 close;
 
        AltosPyro[]             pyros;
+       double                  pyro_firing_time;
 
        ActionListener          listener;
 
@@ -99,12 +106,6 @@ public class AltosConfigUI
                "0", "5", "10", "15", "20"
        };
 
-       static String[]         flight_log_max_values = {
-               "64", "128", "192", "256", "320",
-               "384", "448", "512", "576", "640",
-               "704", "768", "832", "896", "960",
-       };
-
        static String[]         ignite_mode_values = {
                "Dual Deploy",
                "Redundant Apogee",
@@ -118,6 +119,10 @@ public class AltosConfigUI
                "10"
        };
 
+       static Integer[]        aprs_ssid_values = {
+               0, 1, 2 ,3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+       };
+
        static String[]         beep_values = {
                "3750",
                "4000",
@@ -129,32 +134,25 @@ public class AltosConfigUI
                "Antenna Down",
        };
 
-       static String[]         tracker_horiz_values_m = {
-               "250",
-               "500",
-               "1000",
-               "2000"
-       };
-
-       static String[]         tracker_horiz_values_ft = {
-               "500",
-               "1000",
-               "2500",
-               "5000"
+       static String[]         tracker_motion_values_m = {
+               "2",
+               "5",
+               "10",
+               "25",
        };
 
-       static String[]         tracker_vert_values_m = {
-               "25",
+       static String[]         tracker_motion_values_ft = {
+               "5",
+               "20",
                "50",
-               "100",
-               "200"
+               "100"
        };
 
-       static String[]         tracker_vert_values_ft = {
-               "50",
-               "100",
-               "250",
-               "500"
+       static String[]         tracker_interval_values = {
+               "1",
+               "2",
+               "5",
+               "10"
        };
 
        /* A window listener to catch closing events and tell the config code */
@@ -206,6 +204,13 @@ public class AltosConfigUI
                        radio_enable_value.setToolTipText("Firmware version does not support disabling radio");
        }
 
+       void set_rate_tool_tip() {
+               if (rate_value.isEnabled())
+                       rate_value.setToolTipText("Select telemetry baud rate");
+               else
+                       rate_value.setToolTipText("Firmware version does not support variable telemetry rates");
+       }
+
        void set_aprs_interval_tool_tip() {
                if (aprs_interval_value.isEnabled())
                        aprs_interval_value.setToolTipText("Enable APRS and set the interval between APRS reports");
@@ -213,6 +218,24 @@ public class AltosConfigUI
                        aprs_interval_value.setToolTipText("Hardware doesn't support APRS");
        }
 
+       void set_aprs_ssid_tool_tip() {
+               if (aprs_ssid_value.isEnabled())
+                       aprs_ssid_value.setToolTipText("Set the APRS SSID (secondary station identifier)");
+               else if (aprs_ssid_value.isEnabled())
+                       aprs_ssid_value.setToolTipText("Software version doesn't support setting the APRS SSID");
+               else
+                       aprs_ssid_value.setToolTipText("Hardware doesn't support APRS");
+       }
+
+       void set_aprs_format_tool_tip() {
+               if (aprs_format_value.isEnabled())
+                       aprs_format_value.setToolTipText("Set the APRS format (compressed/uncompressed)");
+               else if (aprs_format_value.isEnabled())
+                       aprs_format_value.setToolTipText("Software version doesn't support setting the APRS format");
+               else
+                       aprs_format_value.setToolTipText("Hardware doesn't support APRS");
+       }
+
        void set_flight_log_max_tool_tip() {
                if (flight_log_max_value.isEnabled())
                        flight_log_max_value.setToolTipText("Size reserved for each flight log (in kB)");
@@ -429,7 +452,7 @@ public class AltosConfigUI
                c.anchor = GridBagConstraints.LINE_START;
                c.insets = ir;
                c.ipady = 5;
-               radio_frequency_value = new AltosFreqList();
+               radio_frequency_value = new AltosUIFreqList();
                radio_frequency_value.addItemListener(this);
                pane.add(radio_frequency_value, c);
                radio_frequency_value.setToolTipText("Telemetry, RDF and packet frequency");
@@ -487,6 +510,31 @@ public class AltosConfigUI
                set_radio_enable_tool_tip();
                row++;
 
+               /* Telemetry Rate */
+               c = new GridBagConstraints();
+               c.gridx = 0; c.gridy = row;
+               c.gridwidth = 4;
+               c.fill = GridBagConstraints.NONE;
+               c.anchor = GridBagConstraints.LINE_START;
+               c.insets = il;
+               c.ipady = 5;
+               rate_label = new JLabel("Telemetry baud rate:");
+               pane.add(rate_label, c);
+
+               c = new GridBagConstraints();
+               c.gridx = 4; c.gridy = row;
+               c.gridwidth = 4;
+               c.fill = GridBagConstraints.HORIZONTAL;
+               c.weightx = 1;
+               c.anchor = GridBagConstraints.LINE_START;
+               c.insets = ir;
+               c.ipady = 5;
+               rate_value = new AltosUIRateList();
+               rate_value.addItemListener(this);
+               pane.add(rate_value, c);
+               set_rate_tool_tip();
+               row++;
+
                /* APRS interval */
                c = new GridBagConstraints();
                c.gridx = 0; c.gridy = row;
@@ -513,6 +561,60 @@ public class AltosConfigUI
                set_aprs_interval_tool_tip();
                row++;
 
+               /* APRS SSID */
+               c = new GridBagConstraints();
+               c.gridx = 0; c.gridy = row;
+               c.gridwidth = 4;
+               c.fill = GridBagConstraints.NONE;
+               c.anchor = GridBagConstraints.LINE_START;
+               c.insets = il;
+               c.ipady = 5;
+               aprs_ssid_label = new JLabel("APRS SSID:");
+               pane.add(aprs_ssid_label, c);
+
+               c = new GridBagConstraints();
+               c.gridx = 4; c.gridy = row;
+               c.gridwidth = 4;
+               c.fill = GridBagConstraints.HORIZONTAL;
+               c.weightx = 1;
+               c.anchor = GridBagConstraints.LINE_START;
+               c.insets = ir;
+               c.ipady = 5;
+               aprs_ssid_value = new JComboBox<Integer>(aprs_ssid_values);
+               aprs_ssid_value.setEditable(false);
+               aprs_ssid_value.addItemListener(this);
+               aprs_ssid_value.setMaximumRowCount(aprs_ssid_values.length);
+               pane.add(aprs_ssid_value, c);
+               set_aprs_ssid_tool_tip();
+               row++;
+
+               /* APRS format */
+               c = new GridBagConstraints();
+               c.gridx = 0; c.gridy = row;
+               c.gridwidth = 4;
+               c.fill = GridBagConstraints.NONE;
+               c.anchor = GridBagConstraints.LINE_START;
+               c.insets = il;
+               c.ipady = 5;
+               aprs_format_label = new JLabel("APRS format:");
+               pane.add(aprs_format_label, c);
+
+               c = new GridBagConstraints();
+               c.gridx = 4; c.gridy = row;
+               c.gridwidth = 4;
+               c.fill = GridBagConstraints.HORIZONTAL;
+               c.weightx = 1;
+               c.anchor = GridBagConstraints.LINE_START;
+               c.insets = ir;
+               c.ipady = 5;
+               aprs_format_value = new JComboBox<String>(AltosLib.ao_aprs_format_name);
+               aprs_format_value.setEditable(false);
+               aprs_format_value.addItemListener(this);
+               aprs_format_value.setMaximumRowCount(AltosLib.ao_aprs_format_name.length);
+               pane.add(aprs_format_value, c);
+               set_aprs_format_tool_tip();
+               row++;
+
                /* Callsign */
                c = new GridBagConstraints();
                c.gridx = 0; c.gridy = row;
@@ -546,7 +648,7 @@ public class AltosConfigUI
                c.anchor = GridBagConstraints.LINE_START;
                c.insets = il;
                c.ipady = 5;
-               flight_log_max_label = new JLabel("Maximum Flight Log Size:");
+               flight_log_max_label = new JLabel("Maximum Flight Log Size (kB):");
                pane.add(flight_log_max_label, c);
 
                c = new GridBagConstraints();
@@ -557,7 +659,7 @@ public class AltosConfigUI
                c.anchor = GridBagConstraints.LINE_START;
                c.insets = ir;
                c.ipady = 5;
-               flight_log_max_value = new JComboBox<String>(flight_log_max_values);
+               flight_log_max_value = new JComboBox<String>();
                flight_log_max_value.setEditable(true);
                flight_log_max_value.addItemListener(this);
                pane.add(flight_log_max_value, c);
@@ -650,8 +752,8 @@ public class AltosConfigUI
                c.anchor = GridBagConstraints.LINE_START;
                c.insets = il;
                c.ipady = 5;
-               tracker_horiz_label = new JLabel(get_tracker_horiz_label());
-               pane.add(tracker_horiz_label, c);
+               tracker_motion_label = new JLabel(get_tracker_motion_label());
+               pane.add(tracker_motion_label, c);
 
                c = new GridBagConstraints();
                c.gridx = 4; c.gridy = row;
@@ -661,10 +763,10 @@ public class AltosConfigUI
                c.anchor = GridBagConstraints.LINE_START;
                c.insets = ir;
                c.ipady = 5;
-               tracker_horiz_value = new JComboBox<String>(tracker_horiz_values());
-               tracker_horiz_value.setEditable(true);
-               tracker_horiz_value.addItemListener(this);
-               pane.add(tracker_horiz_value, c);
+               tracker_motion_value = new JComboBox<String>(tracker_motion_values());
+               tracker_motion_value.setEditable(true);
+               tracker_motion_value.addItemListener(this);
+               pane.add(tracker_motion_value, c);
                row++;
 
                /* Tracker triger vert distances */
@@ -675,8 +777,8 @@ public class AltosConfigUI
                c.anchor = GridBagConstraints.LINE_START;
                c.insets = il;
                c.ipady = 5;
-               tracker_vert_label = new JLabel(get_tracker_vert_label());
-               pane.add(tracker_vert_label, c);
+               tracker_interval_label = new JLabel("Position Reporting Interval(s):");
+               pane.add(tracker_interval_label, c);
 
                c = new GridBagConstraints();
                c.gridx = 4; c.gridy = row;
@@ -686,10 +788,10 @@ public class AltosConfigUI
                c.anchor = GridBagConstraints.LINE_START;
                c.insets = ir;
                c.ipady = 5;
-               tracker_vert_value = new JComboBox<String>(tracker_vert_values());
-               tracker_vert_value.setEditable(true);
-               tracker_vert_value.addItemListener(this);
-               pane.add(tracker_vert_value, c);
+               tracker_interval_value = new JComboBox<String>(tracker_interval_values);
+               tracker_interval_value.setEditable(true);
+               tracker_interval_value.addItemListener(this);
+               pane.add(tracker_interval_value, c);
                set_tracker_tool_tip();
                row++;
 
@@ -805,7 +907,7 @@ public class AltosConfigUI
 
                if (cmd.equals("Pyro")) {
                        if (pyro_ui == null && pyros != null)
-                               pyro_ui = new AltosConfigPyroUI(this, pyros);
+                               pyro_ui = new AltosConfigPyroUI(this, pyros, pyro_firing_time);
                        if (pyro_ui != null)
                                pyro_ui.make_visible();
                        return;
@@ -862,9 +964,16 @@ public class AltosConfigUI
                serial_value.setText(String.format("%d", serial));
        }
 
+       public void set_altitude_32(int altitude_32) {
+       }
+
        public void set_main_deploy(int new_main_deploy) {
                main_deploy_value.setSelectedItem(AltosConvert.height.say(new_main_deploy));
                main_deploy_value.setEnabled(new_main_deploy >= 0);
+
+               main_deploy_value.setVisible(new_main_deploy >= 0);
+               main_deploy_label.setVisible(new_main_deploy >= 0);
+
        }
 
        public int main_deploy() {
@@ -892,46 +1001,62 @@ public class AltosConfigUI
        }
 
        public void units_changed(boolean imperial_units) {
+               boolean was_dirty = dirty;
+
                String v = main_deploy_value.getSelectedItem().toString();
                main_deploy_label.setText(get_main_deploy_label());
                set_main_deploy_values();
                int m = (int) (AltosConvert.height.parse(v, !imperial_units) + 0.5);
                set_main_deploy(m);
 
-               if (tracker_horiz_value.isEnabled() && tracker_vert_value.isEnabled()) {
-                       String th = tracker_horiz_value.getSelectedItem().toString();
-                       String tv = tracker_vert_value.getSelectedItem().toString();
-                       tracker_horiz_label.setText(get_tracker_horiz_label());
-                       tracker_vert_label.setText(get_tracker_vert_label());
-                       set_tracker_horiz_values();
-                       set_tracker_vert_values();
-                       int[] t = {
-                               (int) (AltosConvert.height.parse(th, !imperial_units) + 0.5),
-                               (int) (AltosConvert.height.parse(tv, !imperial_units) + 0.5)
-                       };
-                       set_tracker_distances(t);
+               if (tracker_motion_value.isEnabled()) {
+                       String motion = tracker_motion_value.getSelectedItem().toString();
+                       tracker_motion_label.setText(get_tracker_motion_label());
+                       set_tracker_motion_values();
+                       set_tracker_motion((int) (AltosConvert.height.parse(motion, !imperial_units) + 0.5));
                }
+
+               if (!was_dirty)
+                       set_clean();
        }
 
        public void set_apogee_delay(int new_apogee_delay) {
+               apogee_delay_value.setVisible(new_apogee_delay >= 0);
+               apogee_delay_label.setVisible(new_apogee_delay >= 0);
+
                apogee_delay_value.setSelectedItem(Integer.toString(new_apogee_delay));
                apogee_delay_value.setEnabled(new_apogee_delay >= 0);
        }
 
-       public int apogee_delay() {
-               return Integer.parseInt(apogee_delay_value.getSelectedItem().toString());
+       private int parse_int(String name, String s, boolean split) throws AltosConfigDataException {
+               String v = s;
+               if (split)
+                       v = s.split("\\s+")[0];
+               try {
+                       return Integer.parseInt(v);
+               } catch (NumberFormatException ne) {
+                       throw new AltosConfigDataException("Invalid %s \"%s\"", name, s);
+               }
+       }
+
+       public int apogee_delay() throws AltosConfigDataException {
+               return parse_int("apogee delay", apogee_delay_value.getSelectedItem().toString(), false);
        }
 
        public void set_apogee_lockout(int new_apogee_lockout) {
                apogee_lockout_value.setSelectedItem(Integer.toString(new_apogee_lockout));
                apogee_lockout_value.setEnabled(new_apogee_lockout >= 0);
+
+               apogee_lockout_value.setVisible(new_apogee_lockout >= 0);
+               apogee_lockout_label.setVisible(new_apogee_lockout >= 0);
        }
 
-       public int apogee_lockout() {
-               return Integer.parseInt(apogee_lockout_value.getSelectedItem().toString());
+       public int apogee_lockout() throws AltosConfigDataException {
+               return parse_int("apogee lockout", apogee_lockout_value.getSelectedItem().toString(), false);
        }
 
        public void set_radio_frequency(double new_radio_frequency) {
+               radio_frequency_label.setVisible(new_radio_frequency >= 0);
                radio_frequency_value.set_frequency(new_radio_frequency);
        }
 
@@ -941,23 +1066,27 @@ public class AltosConfigUI
 
        public void set_radio_calibration(int new_radio_calibration) {
                radio_calibration_value.setVisible(new_radio_calibration >= 0);
+               radio_calibration_label.setVisible(new_radio_calibration >= 0);
+
                if (new_radio_calibration < 0)
                        radio_calibration_value.setText("Disabled");
                else
                        radio_calibration_value.setText(String.format("%d", new_radio_calibration));
        }
 
-       public int radio_calibration() {
-               return Integer.parseInt(radio_calibration_value.getText());
+       public int radio_calibration() throws AltosConfigDataException {
+               return parse_int("radio calibration", radio_calibration_value.getText(), false);
        }
 
        public void set_radio_enable(int new_radio_enable) {
+               radio_enable_label.setVisible(new_radio_enable >= 0);
+               radio_enable_value.setVisible(new_radio_enable >= 0);
+
                if (new_radio_enable >= 0) {
                        radio_enable_value.setSelected(new_radio_enable > 0);
                        radio_enable_value.setEnabled(true);
                } else {
                        radio_enable_value.setSelected(true);
-                       radio_enable_value.setVisible(radio_frequency() > 0);
                        radio_enable_value.setEnabled(false);
                }
                set_radio_enable_tool_tip();
@@ -970,8 +1099,20 @@ public class AltosConfigUI
                        return -1;
        }
 
+       public void set_telemetry_rate(int new_rate) {
+               rate_label.setVisible(new_rate >= 0);
+
+               rate_value.set_rate(new_rate);
+       }
+
+       public int telemetry_rate() {
+               return rate_value.rate();
+       }
+
        public void set_callsign(String new_callsign) {
                callsign_value.setVisible(new_callsign != null);
+               callsign_label.setVisible(new_callsign != null);
+
                callsign_value.setText(new_callsign);
        }
 
@@ -979,8 +1120,25 @@ public class AltosConfigUI
                return callsign_value.getText();
        }
 
+       int     flight_log_max_limit;
+       int     flight_log_max;
+
+       public String flight_log_max_label(int flight_log_max) {
+               if (flight_log_max_limit != 0) {
+                       int     nflight = flight_log_max_limit / flight_log_max;
+                       String  plural = nflight > 1 ? "s" : "";
+
+                       return String.format("%d (%d flight%s)", flight_log_max, nflight, plural);
+               }
+               return String.format("%d", flight_log_max);
+       }
+
        public void set_flight_log_max(int new_flight_log_max) {
-               flight_log_max_value.setSelectedItem(Integer.toString(new_flight_log_max));
+               flight_log_max_value.setVisible(new_flight_log_max >= 0);
+               flight_log_max_label.setVisible(new_flight_log_max >= 0);
+
+               flight_log_max_value.setSelectedItem(flight_log_max_label(new_flight_log_max));
+               flight_log_max = new_flight_log_max;
                set_flight_log_max_tool_tip();
        }
 
@@ -989,23 +1147,25 @@ public class AltosConfigUI
                set_flight_log_max_tool_tip();
        }
 
-       public int flight_log_max() {
-               return Integer.parseInt(flight_log_max_value.getSelectedItem().toString());
+       public int flight_log_max() throws AltosConfigDataException {
+               return parse_int("flight log max", flight_log_max_value.getSelectedItem().toString(), true);
        }
 
-       public void set_flight_log_max_limit(int flight_log_max_limit) {
-               //boolean       any_added = false;
+       public void set_flight_log_max_limit(int new_flight_log_max_limit) {
+               flight_log_max_limit = new_flight_log_max_limit;
                flight_log_max_value.removeAllItems();
-               for (int i = 0; i < flight_log_max_values.length; i++) {
-                       if (Integer.parseInt(flight_log_max_values[i]) < flight_log_max_limit){
-                               flight_log_max_value.addItem(flight_log_max_values[i]);
-                               //any_added = true;
-                       }
+               for (int i = 8; i >= 1; i--) {
+                       int     size = flight_log_max_limit / i;
+                       flight_log_max_value.addItem(String.format("%d (%d flights)", size, i));
                }
-               flight_log_max_value.addItem(String.format("%d", flight_log_max_limit));
+               if (flight_log_max != 0)
+                       set_flight_log_max(flight_log_max);
        }
 
        public void set_ignite_mode(int new_ignite_mode) {
+               ignite_mode_value.setVisible(new_ignite_mode >= 0);
+               ignite_mode_label.setVisible(new_ignite_mode >= 0);
+
                if (new_ignite_mode >= ignite_mode_values.length)
                        new_ignite_mode = 0;
                if (new_ignite_mode < 0) {
@@ -1027,14 +1187,13 @@ public class AltosConfigUI
 
 
        public void set_pad_orientation(int new_pad_orientation) {
+               pad_orientation_value.setVisible(new_pad_orientation >= 0);
+               pad_orientation_label.setVisible(new_pad_orientation >= 0);
+
                if (new_pad_orientation >= pad_orientation_values.length)
                        new_pad_orientation = 0;
-               if (new_pad_orientation < 0) {
-                       pad_orientation_value.setVisible(false);
+               if (new_pad_orientation < 0)
                        new_pad_orientation = 0;
-               } else {
-                       pad_orientation_value.setVisible(true);
-               }
                pad_orientation_value.setSelectedIndex(new_pad_orientation);
                set_pad_orientation_tool_tip();
        }
@@ -1047,6 +1206,9 @@ public class AltosConfigUI
        }
 
        public void set_beep(int new_beep) {
+               beep_value.setVisible(new_beep >= 0);
+               beep_label.setVisible(new_beep >= 0);
+
                int new_freq = (int) Math.floor (AltosConvert.beep_value_to_freq(new_beep) + 0.5);
                for (int i = 0; i < beep_values.length; i++)
                        if (new_beep == AltosConvert.beep_freq_to_value(Integer.parseInt(beep_values[i]))) {
@@ -1066,78 +1228,67 @@ public class AltosConfigUI
                        return -1;
        }
 
-       String[] tracker_horiz_values() {
+       String[] tracker_motion_values() {
                if (AltosConvert.imperial_units)
-                       return tracker_horiz_values_ft;
+                       return tracker_motion_values_ft;
                else
-                       return tracker_horiz_values_m;
+                       return tracker_motion_values_m;
        }
 
-       void set_tracker_horiz_values() {
-               String[]        v = tracker_horiz_values();
-               while (tracker_horiz_value.getItemCount() > 0)
-                       tracker_horiz_value.removeItemAt(0);
+       void set_tracker_motion_values() {
+               String[]        v = tracker_motion_values();
+               while (tracker_motion_value.getItemCount() > 0)
+                       tracker_motion_value.removeItemAt(0);
                for (int i = 0; i < v.length; i++)
-                       tracker_horiz_value.addItem(v[i]);
-               tracker_horiz_value.setMaximumRowCount(v.length);
+                       tracker_motion_value.addItem(v[i]);
+               tracker_motion_value.setMaximumRowCount(v.length);
        }
 
-       String get_tracker_horiz_label() {
-               return String.format("Logging Trigger Horizontal (%s):", AltosConvert.height.show_units());
+       String get_tracker_motion_label() {
+               return String.format("Logging Trigger Motion (%s):", AltosConvert.height.show_units());
        }
 
-       String[] tracker_vert_values() {
-               if (AltosConvert.imperial_units)
-                       return tracker_vert_values_ft;
+       void set_tracker_tool_tip() {
+               if (tracker_motion_value.isEnabled())
+                       tracker_motion_value.setToolTipText("How far the device must move before logging");
+               else
+                       tracker_motion_value.setToolTipText("This device doesn't disable logging when stationary");
+               if (tracker_interval_value.isEnabled())
+                       tracker_interval_value.setToolTipText("How often to report GPS position");
                else
-                       return tracker_vert_values_m;
+                       tracker_interval_value.setToolTipText("This device can't configure interval");
        }
 
-       void set_tracker_vert_values() {
-               String[]        v = tracker_vert_values();
-               while (tracker_vert_value.getItemCount() > 0)
-                       tracker_vert_value.removeItemAt(0);
-               for (int i = 0; i < v.length; i++)
-                       tracker_vert_value.addItem(v[i]);
-               tracker_vert_value.setMaximumRowCount(v.length);
-       }
+       public void set_tracker_motion(int tracker_motion) {
+               tracker_motion_label.setVisible(tracker_motion >= 0);
+               tracker_motion_value.setVisible(tracker_motion >= 0);
 
-       void set_tracker_tool_tip() {
-               if (tracker_horiz_value.isEnabled())
-                       tracker_horiz_value.setToolTipText("How far the device must move before logging is enabled");
-               else
-                       tracker_horiz_value.setToolTipText("This device doesn't disable logging before motion");
-               if (tracker_vert_value.isEnabled())
-                       tracker_vert_value.setToolTipText("How far the device must move before logging is enabled");
-               else
-                       tracker_vert_value.setToolTipText("This device doesn't disable logging before motion");
+               if (tracker_motion < 0) {
+                       tracker_motion_value.setEnabled(false);
+               } else {
+                       tracker_motion_value.setEnabled(true);
+                       tracker_motion_value.setSelectedItem(AltosConvert.height.say(tracker_motion));
+               }
        }
 
-       String get_tracker_vert_label() {
-               return String.format("Logging Trigger Vertical (%s):", AltosConvert.height.show_units());
+       public int tracker_motion() throws AltosConfigDataException {
+               return (int) AltosConvert.height.parse(tracker_motion_value.getSelectedItem().toString());
        }
 
-       public void set_tracker_distances(int[] tracker_distances) {
-               if (tracker_distances != null) {
-                       tracker_horiz_value.setSelectedItem(AltosConvert.height.say(tracker_distances[0]));
-                       tracker_vert_value.setSelectedItem(AltosConvert.height.say(tracker_distances[1]));
-                       tracker_horiz_value.setEnabled(true);
-                       tracker_vert_value.setEnabled(true);
+       public void set_tracker_interval(int tracker_interval) {
+               tracker_interval_label.setVisible(tracker_interval >= 0);
+               tracker_interval_value.setVisible(tracker_interval >= 0);
+
+               if (tracker_interval< 0) {
+                       tracker_interval_value.setEnabled(false);
                } else {
-                       tracker_horiz_value.setEnabled(false);
-                       tracker_vert_value.setEnabled(false);
+                       tracker_interval_value.setEnabled(true);
+                       tracker_interval_value.setSelectedItem(String.format("%d", tracker_interval));
                }
        }
 
-       public int[] tracker_distances() {
-               if (tracker_horiz_value.isEnabled() && tracker_vert_value.isEnabled()) {
-                       int[] t = {
-                               (int) (AltosConvert.height.parse(tracker_horiz_value.getSelectedItem().toString()) + 0.5),
-                               (int) (AltosConvert.height.parse(tracker_vert_value.getSelectedItem().toString()) + 0.5),
-                       };
-                       return t;
-               }
-               return null;
+       public int tracker_interval() throws AltosConfigDataException {
+               return parse_int ("tracker interval", tracker_interval_value.getSelectedItem().toString(), false);
        }
 
        public void set_pyros(AltosPyro[] new_pyros) {
@@ -1147,13 +1298,29 @@ public class AltosConfigUI
                        pyro_ui.set_pyros(pyros);
        }
 
-       public AltosPyro[] pyros() {
+       public AltosPyro[] pyros() throws AltosConfigDataException {
                if (pyro_ui != null)
                        pyros = pyro_ui.get_pyros();
                return pyros;
        }
 
+       public void set_pyro_firing_time(double new_pyro_firing_time) {
+               pyro_firing_time = new_pyro_firing_time;
+               pyro.setVisible(pyro_firing_time >= 0);
+               if (pyro_firing_time >= 0 && pyro_ui != null)
+                       pyro_ui.set_pyro_firing_time(pyro_firing_time);
+       }
+
+       public double pyro_firing_time() throws AltosConfigDataException {
+               if (pyro_ui != null)
+                       pyro_firing_time = pyro_ui.get_pyro_firing_time();
+               return pyro_firing_time;
+       }
+
        public void set_aprs_interval(int new_aprs_interval) {
+               aprs_interval_value.setVisible(new_aprs_interval >= 0);
+               aprs_interval_label.setVisible(new_aprs_interval >= 0);
+
                String  s;
 
                if (new_aprs_interval <= 0)
@@ -1161,15 +1328,39 @@ public class AltosConfigUI
                else
                        s = Integer.toString(new_aprs_interval);
                aprs_interval_value.setSelectedItem(s);
-               aprs_interval_value.setVisible(new_aprs_interval >= 0);
                set_aprs_interval_tool_tip();
        }
 
-       public int aprs_interval() {
+       public int aprs_interval() throws AltosConfigDataException {
                String  s = aprs_interval_value.getSelectedItem().toString();
 
                if (s.equals("Disabled"))
                        return 0;
-               return Integer.parseInt(s);
+               return parse_int("aprs interval", s, false);
+       }
+
+       public void set_aprs_ssid(int new_aprs_ssid) {
+               aprs_ssid_value.setVisible(new_aprs_ssid >= 0);
+               aprs_ssid_label.setVisible(new_aprs_ssid >= 0);
+
+               aprs_ssid_value.setSelectedItem(Math.max(0,new_aprs_ssid));
+               set_aprs_ssid_tool_tip();
+       }
+
+       public int aprs_ssid() throws AltosConfigDataException {
+               Integer i = (Integer) aprs_ssid_value.getSelectedItem();
+               return i;
+       }
+
+       public void set_aprs_format(int new_aprs_format) {
+               aprs_format_value.setVisible(new_aprs_format >= 0);
+               aprs_format_label.setVisible(new_aprs_format >= 0);
+
+               aprs_format_value.setSelectedIndex(Math.max(0,new_aprs_format));
+               set_aprs_format_tool_tip();
+       }
+
+       public int aprs_format() throws AltosConfigDataException {
+               return aprs_format_value.getSelectedIndex();
        }
 }