X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightUI.java;h=600d8acce428232f973e0ff4cef79c7bf13b7db7;hp=d166c9aefbb30147d06118f0e11a55487903e2c5;hb=1b5340c2b75c500011355c4889da443c4b9c4891;hpb=7ecde50fbebe68a2e2200a2f8d081fd37074f840

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index d166c9ae..600d8acc 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -27,6 +27,7 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.*;
+import org.altusmetrum.AltosLib.*;
 
 public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, AltosFontListener {
 	AltosVoice		voice;
@@ -98,7 +99,11 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 		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,9 +155,12 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 	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);
+		AltosUIPreferences.set_component(this);
 
 		voice = in_voice;
 		reader = in_reader;
@@ -162,16 +170,12 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 
 		GridBagConstraints c = new GridBagConstraints();
 
-		java.net.URL imgURL = AltosUI.class.getResource("/altus-metrum-16x16.jpg");
-		if (imgURL != null)
-			setIconImage(new ImageIcon(imgURL).getImage());
-
 		setTitle(String.format("AltOS %s", reader.name));
 
 		/* Stick channel selector at top of table for telemetry monitoring */
 		if (serial >= 0) {
 			// Channel menu
-			frequencies = new AltosFreqList(AltosPreferences.frequency(serial));
+			frequencies = new AltosFreqList(AltosUIPreferences.frequency(serial));
 			frequencies.set_product("Monitor");
 			frequencies.set_serial(serial);
 			frequencies.addActionListener(new ActionListener() {
@@ -195,32 +199,53 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 			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 */
@@ -270,7 +295,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 
-		AltosPreferences.register_font_listener(this);
+		AltosUIPreferences.register_font_listener(this);
 
 		addWindowListener(new WindowAdapter() {
 				@Override
@@ -278,7 +303,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 					disconnect();
 					setVisible(false);
 					dispose();
-					AltosPreferences.unregister_font_listener(AltosFlightUI.this);
+					AltosUIPreferences.unregister_font_listener(AltosFlightUI.this);
 					if (exit_on_close)
 						System.exit(0);
 				}
@@ -289,6 +314,10 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 
 		thread = new AltosDisplayThread(this, voice, this, reader);
 
+		status_update = new AltosFlightStatusUpdate(flightStatus);
+
+		new javax.swing.Timer(100, status_update).start();
+
 		thread.start();
 	}