X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosFlightUI.java;h=d99da43dea0622b4f50bbd53ddbabeeb647bea9d;hb=d77a4ea206d627635159f35c76c744687d4e633b;hp=b44b9d43b84c4a7f3f511120a4c2e183c68f028d;hpb=3d88e0493ab446d7c7011786390d30618a72d045;p=fw%2Faltos

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index b44b9d43..d99da43d 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -28,7 +28,22 @@ import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.*;
 
-public class AltosFlightUI extends JFrame implements AltosFlightDisplay, AltosFontListener {
+class AltosFlightStatusUpdate implements ActionListener {
+
+	public AltosState	saved_state;
+	AltosFlightStatus	flightStatus;
+
+	public void actionPerformed (ActionEvent e) {
+		if (saved_state != null)
+			flightStatus.show(saved_state, 0);
+	}
+
+	public AltosFlightStatusUpdate (AltosFlightStatus in_flightStatus) {
+		flightStatus = in_flightStatus;
+	}
+}
+
+public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, AltosFontListener {
 	AltosVoice		voice;
 	AltosFlightReader	reader;
 	AltosDisplayThread	thread;
@@ -98,7 +113,11 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay, AltosFo
 		set_font();
 	}
 
+
+	AltosFlightStatusUpdate	status_update;
+
 	public void show(AltosState state, int crc_errors) {
+		status_update.saved_state = state;
 		JComponent tab = which_tab(state);
 		try {
 		pad.show(state, crc_errors);
@@ -150,6 +169,9 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay, AltosFo
 	Container	bag;
 	AltosFreqList	frequencies;
 	JComboBox	telemetries;
+	JLabel		telemetry;
+
+	ActionListener	show_timer;
 
 	public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
 		AltosPreferences.set_component(this);
@@ -195,32 +217,53 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay, AltosFo
 			bag.add (frequencies, c);
 
 			// Telemetry format menu
-			telemetries = new JComboBox();
-			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.setPreferredSize(null);
-			telemetries.revalidate();
-			telemetries.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						int telemetry = telemetries.getSelectedIndex() + 1;
-						reader.set_telemetry(telemetry);
-						reader.save_telemetry();
-					}
-				});
-			c.gridx = 1;
-			c.gridy = 0;
-			c.weightx = 0;
-			c.weighty = 0;
-			c.fill = GridBagConstraints.NONE;
-			c.anchor = GridBagConstraints.WEST;
-			bag.add (telemetries, c);
-			c.insets = new Insets(0, 0, 0, 0);
+			if (reader.supports_telemetry(Altos.ao_telemetry_standard)) {
+				telemetries = new JComboBox();
+				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.setPreferredSize(null);
+				telemetries.revalidate();
+				telemetries.addActionListener(new ActionListener() {
+						public void actionPerformed(ActionEvent e) {
+							int telemetry = telemetries.getSelectedIndex() + 1;
+							reader.set_telemetry(telemetry);
+							reader.save_telemetry();
+						}
+					});
+				c.gridx = 1;
+				c.gridy = 0;
+				c.weightx = 0;
+				c.weighty = 0;
+				c.fill = GridBagConstraints.NONE;
+				c.anchor = GridBagConstraints.WEST;
+				bag.add (telemetries, c);
+				c.insets = new Insets(0, 0, 0, 0);
+			} else {
+				String	version;
+
+				if (reader.supports_telemetry(Altos.ao_telemetry_0_9))
+					version = "Telemetry: 0.9";
+				else if (reader.supports_telemetry(Altos.ao_telemetry_0_8))
+					version = "Telemetry: 0.8";
+				else
+					version = "Telemetry: None";
+
+				telemetry = new JLabel(version);
+				c.gridx = 1;
+				c.gridy = 0;
+				c.weightx = 0;
+				c.weighty = 0;
+				c.fill = GridBagConstraints.NONE;
+				c.anchor = GridBagConstraints.WEST;
+				bag.add (telemetry, c);
+				c.insets = new Insets(0, 0, 0, 0);
+			}
 		}
 
 		/* Flight status is always visible */
@@ -289,6 +332,10 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay, AltosFo
 
 		thread = new AltosDisplayThread(this, voice, this, reader);
 
+		status_update = new AltosFlightStatusUpdate(flightStatus);
+
+		new javax.swing.Timer(100, status_update).start();
+
 		thread.start();
 	}