altosui: Remove another beep config debug printf

[fw/altos] / altosui / AltosConfigUI.java

diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java
index 21ea50e638f6bb21ddcab43dd0c5009c2b67bfb9..6292f77870fd6c19a8cca0893572970dc111c9fb 100644 (file)
--- a/altosui/AltosConfigUI.java
+++ b/altosui/AltosConfigUI.java
@@ -45,6 +45,7 @@ public class AltosConfigUI
        JLabel          ignite_mode_label;
        JLabel          pad_orientation_label;
        JLabel          callsign_label;
+       JLabel          beep_label;
 
        public boolean          dirty;
 
@@ -63,6 +64,7 @@ public class AltosConfigUI
        JComboBox       ignite_mode_value;
        JComboBox       pad_orientation_value;
        JTextField      callsign_value;
+       JComboBox       beep_value;
 
        JButton         pyro;
 
@@ -112,6 +114,12 @@ public class AltosConfigUI
                "10"
        };
 
+       static String[] beep_values = {
+               "3750",
+               "4000",
+               "4250",
+       };
+
        static String[] pad_orientation_values = {
                "Antenna Up",
                "Antenna Down",
@@ -132,11 +140,21 @@ public class AltosConfigUI
                }
        }
 
+       boolean is_telemini_v1() {
+               String  product = product_value.getText();
+               return product != null && product.startsWith("TeleMini-v1");
+       }
+
        boolean is_telemini() {
                String  product = product_value.getText();
                return product != null && product.startsWith("TeleMini");
        }
 
+       boolean is_easymini() {
+               String  product = product_value.getText();
+               return product != null && product.startsWith("EasyMini");
+       }
+
        boolean is_telemetrum() {
                String  product = product_value.getText();
                return product != null && product.startsWith("TeleMetrum");
@@ -167,12 +185,10 @@ public class AltosConfigUI
                if (flight_log_max_value.isEnabled())
                        flight_log_max_value.setToolTipText("Size reserved for each flight log (in kB)");
                else {
-                       if (is_telemetrum())
-                               flight_log_max_value.setToolTipText("Cannot set max value with flight logs in memory");
-                       else if (is_telemini())
-                               flight_log_max_value.setToolTipText("TeleMini stores only one flight");
+                       if (is_telemini_v1())
+                               flight_log_max_value.setToolTipText("TeleMini-v1 stores only one flight");
                        else
-                               flight_log_max_value.setToolTipText("Cannot set max flight log value");
+                               flight_log_max_value.setToolTipText("Cannot set max value with flight logs in memory");
                }
        }
 
@@ -189,13 +205,20 @@ public class AltosConfigUI
                else {
                        if (is_telemetrum())
                                pad_orientation_value.setToolTipText("Older TeleMetrum firmware must fly antenna forward");
-                       else if (is_telemini())
-                               pad_orientation_value.setToolTipText("TeleMini doesn't care how it is mounted");
+                       else if (is_telemini() || is_easymini())
+                               pad_orientation_value.setToolTipText("TeleMini and EasyMini don't care how they are mounted");
                        else
                                pad_orientation_value.setToolTipText("Can't select orientation");
                }
        }
 
+       void set_beep_tool_tip() {
+               if (beep_value.isEnabled())
+                       beep_value.setToolTipText("What frequency the beeper will sound at");
+               else
+                       beep_value.setToolTipText("Older firmware could not select beeper frequency");
+       }
+
        /* Build the UI using a grid bag */
        public AltosConfigUI(JFrame in_owner, boolean remote) {
                super (in_owner, "Configure Flight Computer", false);
@@ -561,6 +584,32 @@ public class AltosConfigUI
                set_pad_orientation_tool_tip();
                row++;
 
+               /* Beeper */
+               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;
+               beep_label = new JLabel("Beeper Frequency:");
+               pane.add(beep_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;
+               beep_value = new JComboBox(beep_values);
+               beep_value.setEditable(true);
+               beep_value.addItemListener(this);
+               pane.add(beep_value, c);
+               set_beep_tool_tip();
+               row++;
+
                /* Pyro channels */
                c = new GridBagConstraints();
                c.gridx = 4; c.gridy = row;
@@ -742,14 +791,14 @@ public class AltosConfigUI
        String get_main_deploy_label() {
                return String.format("Main Deploy Altitude(%s):", AltosConvert.height.show_units());
        }
-       
+
        String[] main_deploy_values() {
                if (AltosConvert.imperial_units)
                        return main_deploy_values_ft;
                else
                        return main_deploy_values_m;
        }
-                       
+
        void set_main_deploy_values() {
                String[]        v = main_deploy_values();
                while (main_deploy_value.getItemCount() > 0)
@@ -758,7 +807,7 @@ public class AltosConfigUI
                        main_deploy_value.addItem(v[i]);
                main_deploy_value.setMaximumRowCount(v.length);
        }
-       
+
        public void units_changed(boolean imperial_units) {
                String v = main_deploy_value.getSelectedItem().toString();
                main_deploy_label.setText(get_main_deploy_label());
@@ -834,7 +883,6 @@ public class AltosConfigUI
        }
 
        public void set_flight_log_max(int new_flight_log_max) {
-               flight_log_max_value.setEnabled(new_flight_log_max > 0);
                flight_log_max_value.setSelectedItem(Integer.toString(new_flight_log_max));
                set_flight_log_max_tool_tip();
        }
@@ -901,6 +949,26 @@ public class AltosConfigUI
                        return -1;
        }
 
+       public void set_beep(int new_beep) {
+               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]))) {
+                               beep_value.setSelectedIndex(i);
+                               set_beep_tool_tip();
+                               return;
+                       }
+               beep_value.setSelectedItem(String.format("%d", new_freq));
+               beep_value.setEnabled(new_beep >= 0);
+               set_beep_tool_tip();
+       }
+
+       public int beep() {
+               if (beep_value.isEnabled())
+                       return AltosConvert.beep_freq_to_value(Integer.parseInt(beep_value.getSelectedItem().toString()));
+               else
+                       return -1;
+       }
+
        public void set_pyros(AltosPyro[] new_pyros) {
                pyros = new_pyros;
                pyro.setVisible(pyros != null);