altosui/telegps: Change from variable-units snuck into master

[fw/altos] / altosui / AltosConfigUI.java

diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java
index 54f06065af4da4df28c43880eb066b8f83a7a0c5..67decaa4f589e4e07cca3845763ae0392e1424c2 100644 (file)
--- a/altosui/AltosConfigUI.java
+++ b/altosui/AltosConfigUI.java
@@ -43,6 +43,7 @@ public class AltosConfigUI
        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;
@@ -66,6 +67,7 @@ public class AltosConfigUI
        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;
@@ -218,11 +220,20 @@ public class AltosConfigUI
 
        void set_aprs_ssid_tool_tip() {
                if (aprs_ssid_value.isEnabled())
-                       aprs_interval_value.setToolTipText("Set the APRS SSID (secondary station identifier)");
-               else if (aprs_interval_value.isEnabled())
-                       aprs_interval_value.setToolTipText("Software version doesn't support setting the APRS SSID");
+                       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_interval_value.setToolTipText("Hardware doesn't support APRS");
+                       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() {
@@ -577,6 +588,33 @@ public class AltosConfigUI
                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;
@@ -1313,4 +1351,16 @@ public class AltosConfigUI
                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();
+       }
 }