altosui: Start adding support for scanning radio for available devices

[fw/altos] / altosui / AltosFlightUI.java

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index eb6c6d9d82d1edc5f3500dcc142f3769dfc6d39d..9536c4bbdf1fef7ad6ae52146822c4cf6f832be4 100644 (file)
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -156,9 +156,13 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 
                        // Telemetry format menu
                        telemetries = new JComboBox();
-                       telemetries.addItem("TeleMetrum");
-                       telemetries.addItem("TeleMini/TeleNano");
-                       telemetries.setSelectedIndex(AltosPreferences.telemetry(serial) - 1);
+                       telemetries.addItem("Original TeleMetrum Telemetry");
+                       telemetries.addItem("Standard AltOS Telemetry");
+                       int telemetry = 1;
+                       telemetry = AltosPreferences.telemetry(serial);
+                       if (telemetry > Altos.ao_telemetry_split)
+                               telemetry = Altos.ao_telemetry_split;
+                       telemetries.setSelectedIndex(telemetry - 1);
                        telemetries.setMaximumRowCount(2);
                        telemetries.addActionListener(new ActionListener() {
                                        public void actionPerformed(ActionEvent e) {