X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosFlightUI.java;h=f0626e7ccdfae49fbd35bf35ccad01619d951f9b;hb=4962bcf1ce15c21a946ea718bd676b901f0f2bd0;hp=5f1fc6788e89b2fde8737364506d267948936283;hpb=7fd9b8f720add559b262e81d61ededc9df16ca94;p=fw%2Faltos

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index 5f1fc678..f0626e7c 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -26,7 +26,7 @@ import java.io.*;
 import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.*;
 
 public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 	AltosVoice		voice;
@@ -118,7 +118,7 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 	}
 
 	Container	bag;
-	JComboBox	channels;
+	AltosFreqList	frequencies;
 	JComboBox	telemetries;
 
 	public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
@@ -141,33 +141,41 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		/* Stick channel selector at top of table for telemetry monitoring */
 		if (serial >= 0) {
 			// Channel menu
-			channels = new AltosChannelMenu(AltosPreferences.channel(serial));
-			channels.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent e) {
-					int channel = channels.getSelectedIndex();
-					reader.set_channel(channel);
-				}
+			frequencies = new AltosFreqList(AltosPreferences.frequency(serial));
+			frequencies.set_product("Monitor");
+			frequencies.set_serial(serial);
+			frequencies.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						double frequency = frequencies.frequency();
+						try {
+							reader.set_frequency(frequency);
+						} catch (TimeoutException te) {
+						} catch (InterruptedException ie) {
+						}
+						reader.save_frequency();
+					}
 			});
 			c.gridx = 0;
 			c.gridy = 0;
 			c.insets = new Insets(3, 3, 3, 3);
 			c.anchor = GridBagConstraints.WEST;
-			bag.add (channels, c);
+			bag.add (frequencies, c);
 
 			// Telemetry format menu
 			telemetries = new JComboBox();
-			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;
+			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(2);
+			telemetries.setMaximumRowCount(Altos.ao_telemetry_max);
 			telemetries.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						int telemetry = telemetries.getSelectedIndex() + 1;
 						reader.set_telemetry(telemetry);
+						reader.save_telemetry();
 					}
 				});
 			c.gridx = 1;
@@ -202,7 +210,7 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		descent = new AltosDescent();
 		pane.add("Descent", descent);
 
-		landed = new AltosLanded();
+		landed = new AltosLanded(reader);
 		pane.add("Landed", landed);
 
 		flightInfo = new AltosInfoTable();