Add note about including Google maps API key

[fw/altos] / altosui / AltosConfigUI.java

diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java
index 1b5ff9881b0c2ee28458e9ff8772d778fcf3bf5e..6e1b47c21260abebfbc1dd5ed2f566d684ab630b 100644 (file)
--- a/altosui/AltosConfigUI.java
+++ b/altosui/AltosConfigUI.java
@@ -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_5.*;
+import org.altusmetrum.altosuilib_3.*;
 
 public class AltosConfigUI
        extends AltosUIDialog
@@ -41,6 +41,7 @@ public class AltosConfigUI
        JLabel                  radio_frequency_label;
        JLabel                  radio_enable_label;
        JLabel                  aprs_interval_label;
+       JLabel                  aprs_ssid_label;
        JLabel                  flight_log_max_label;
        JLabel                  ignite_mode_label;
        JLabel                  pad_orientation_label;
@@ -62,6 +63,7 @@ public class AltosConfigUI
        JTextField              radio_calibration_value;
        JRadioButton            radio_enable_value;
        JComboBox<String>       aprs_interval_value;
+       JComboBox<Integer>      aprs_ssid_value;
        JComboBox<String>       flight_log_max_value;
        JComboBox<String>       ignite_mode_value;
        JComboBox<String>       pad_orientation_value;
@@ -113,6 +115,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",
@@ -201,6 +207,15 @@ public class AltosConfigUI
                        aprs_interval_value.setToolTipText("Hardware doesn't support APRS");
        }
 
+       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");
+               else
+                       aprs_interval_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)");
@@ -419,7 +434,10 @@ public class AltosConfigUI
                c.ipady = 5;
                radio_frequency_value = new AltosFreqList();
                radio_frequency_value.addItemListener(this);
-               pane.add(radio_frequency_value, c);
+
+               JMenuBar menu_bar = new JMenuBar();
+               menu_bar.add(radio_frequency_value);
+               pane.add(menu_bar, c);
                radio_frequency_value.setToolTipText("Telemetry, RDF and packet frequency");
                row++;
 
@@ -501,6 +519,33 @@ 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++;
+
                /* Callsign */
                c = new GridBagConstraints();
                c.gridx = 0; c.gridy = row;
@@ -1177,4 +1222,15 @@ public class AltosConfigUI
                        return 0;
                return parse_int("aprs interval", s, false);
        }
+
+       public void set_aprs_ssid(int new_aprs_ssid) {
+               aprs_ssid_value.setSelectedItem(Math.max(0,new_aprs_ssid));
+               aprs_ssid_value.setVisible(new_aprs_ssid >= 0);
+               set_aprs_ssid_tool_tip();
+       }
+
+       public int aprs_ssid() throws AltosConfigDataException {
+               Integer i = (Integer) aprs_ssid_value.getSelectedItem();
+               return i;
+       }
 }