altosui: Support raw telemetry from TeleDongle

[fw/altos] / altosui / AltosFlightUI.java

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index 286b2a4eeb3519e19a8fdfecfdb167b8e3cc5b80..5f1fc6788e89b2fde8737364506d267948936283 100644 (file)
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -122,7 +122,7 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
        JComboBox       telemetries;
 
        public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
-               AltosPreferences.init(this);
+               AltosPreferences.set_component(this);
 
                voice = in_voice;
                reader = in_reader;
@@ -156,13 +156,17 @@ 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("Legacy TeleMetrum");
+                       telemetries.addItem("Split 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) {
-                                               int telemetry = telemetries.getSelectedIndex();
+                                               int telemetry = telemetries.getSelectedIndex() + 1;
                                                reader.set_telemetry(telemetry);
                                        }
                                });