X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightUI.java;h=04bfc90dff237b1ed740bcfbaefaae8c4449f6ca;hp=66dcdad57863f8942a49d2fc3d87ea3834ab5d48;hb=5082b4998b8a9787e0e2f4d96d912e434aa9b81a;hpb=91a75279b6d306ba9d068a28c64917d5312122e8

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index 66dcdad5..04bfc90d 100644
--- 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,10 +156,14 @@ 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.setMaximumRowCount(2);
+			for (int i = 1; i <= Altos.ao_telemetry_max; i++)
+				telemetries.addItem(Altos.telemetry_name(i));
+			int telemetry = AltosPreferences.telemetry(serial);
+			if (telemetry <= Altos.ao_telemetry_off ||
+			    telemetry > Altos.ao_telemetry_max)
+				telemetry = Altos.ao_telemetry_standard;
+			telemetries.setSelectedIndex(telemetry - 1);
+			telemetries.setMaximumRowCount(Altos.ao_telemetry_max);
 			telemetries.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						int telemetry = telemetries.getSelectedIndex() + 1;