X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosIdleMonitorUI.java;h=dbac2d332c5fbbf84812fc18549e3e806ea3b667;hb=7a9baabaf33db5e30eb4ef8f923a4fd96fd28fb4;hp=a4262caee321ae643fcf7908ca0184e2041eeb0b;hpb=11a2bb8e28df7ed87542f2ee726f877971f5d52a;p=fw%2Faltos

diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index a4262cae..dbac2d33 100644
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -167,7 +167,7 @@ class AltosIdleMonitor extends Thread {
 	AltosIdleMonitorUI	ui;
 	AltosState		state;
 	boolean			remote;
-	int			channel;
+	double			frequency;
 	AltosState		previous_state;
 	AltosConfigData		config_data;
 	AltosADC		adc;
@@ -178,7 +178,7 @@ class AltosIdleMonitor extends Thread {
 
 		try {
 			if (remote) {
-				set_channel(channel);
+				serial.set_radio_frequency(frequency);
 				serial.start_remote();
 			} else
 				serial.flush_input();
@@ -193,7 +193,7 @@ class AltosIdleMonitor extends Thread {
 		record.version = 0;
 		record.callsign = config_data.callsign;
 		record.serial = config_data.serial;
-		record.flight = 0;
+		record.flight = config_data.log_available() > 0 ? 255 : 0;
 		record.rssi = 0;
 		record.status = 0;
 		record.state = Altos.ao_flight_idle;
@@ -217,8 +217,8 @@ class AltosIdleMonitor extends Thread {
 		state = new AltosState (record, state);
 	}
 
-	void set_channel(int in_channel) {
-		channel = in_channel;
+	void set_frequency(double in_frequency) {
+		frequency = in_frequency;
 	}
 
 	public void post_state() {
@@ -246,7 +246,7 @@ class AltosIdleMonitor extends Thread {
 	}
 
 	public AltosIdleMonitor(AltosIdleMonitorUI in_ui, AltosDevice in_device, boolean in_remote)
-		throws FileNotFoundException, AltosSerialInUseException {
+		throws FileNotFoundException, AltosSerialInUseException, InterruptedException, TimeoutException {
 		device = in_device;
 		ui = in_ui;
 		serial = new AltosSerial(device);
@@ -255,7 +255,7 @@ class AltosIdleMonitor extends Thread {
 	}
 }
 
-public class AltosIdleMonitorUI extends JFrame implements AltosFlightDisplay {
+public class AltosIdleMonitorUI extends AltosFrame implements AltosFlightDisplay, AltosFontListener {
 	AltosDevice		device;
 	JTabbedPane		pane;
 	AltosPad		pad;
@@ -284,7 +284,19 @@ public class AltosIdleMonitorUI extends JFrame implements AltosFlightDisplay {
 		flightInfo.clear();
 	}
 
+	public void set_font() {
+		pad.set_font();
+		flightInfo.set_font();
+	}
+
+	public void font_size_changed(int font_size) {
+		set_font();
+	}
+
+	AltosFlightStatusUpdate	status_update;
+
 	public void show(AltosState state, int crc_errors) {
+		status_update.saved_state = state;
 		try {
 			pad.show(state, crc_errors);
 			flightStatus.show(state, crc_errors);
@@ -299,9 +311,10 @@ public class AltosIdleMonitorUI extends JFrame implements AltosFlightDisplay {
 	}
 
 	Container	bag;
-	JComboBox	channels;
+	AltosFreqList	frequencies;
 
-	public AltosIdleMonitorUI(JFrame in_owner) throws FileNotFoundException, AltosSerialInUseException {
+	public AltosIdleMonitorUI(JFrame in_owner)
+		throws FileNotFoundException, AltosSerialInUseException, TimeoutException, InterruptedException {
 
 		device = AltosDeviceDialog.show(in_owner, Altos.product_any);
 		remote = false;
@@ -320,21 +333,23 @@ public class AltosIdleMonitorUI extends JFrame implements AltosFlightDisplay {
 
 		setTitle(String.format("AltOS %s", device.toShortString()));
 
-		/* Stick channel selector at top of table for telemetry monitoring */
+		/* Stick frequency selector at top of table for telemetry monitoring */
 		if (remote && serial >= 0) {
-			// Channel menu
-			channels = new AltosChannelMenu(AltosPreferences.channel(serial));
-			channels.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent e) {
-					int channel = channels.getSelectedIndex();
-					thread.set_channel(channel);
-				}
+			// Frequency menu
+			frequencies = new AltosFreqList(AltosPreferences.frequency(serial));
+			frequencies.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						double frequency = frequencies.frequency();
+						thread.set_frequency(frequency);
+						AltosPreferences.set_frequency(device.getSerial(),
+									       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);
 		}
 
 
@@ -369,12 +384,16 @@ public class AltosIdleMonitorUI extends JFrame implements AltosFlightDisplay {
 		bag.add(pane, c);
 
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+
+		AltosPreferences.register_font_listener(this);
+
 		addWindowListener(new WindowAdapter() {
 				@Override
 				public void windowClosing(WindowEvent e) {
 					disconnect();
 					setVisible(false);
 					dispose();
+					AltosPreferences.unregister_font_listener(AltosIdleMonitorUI.this);
 				}
 			});
 
@@ -383,6 +402,10 @@ public class AltosIdleMonitorUI extends JFrame implements AltosFlightDisplay {
 
 		thread = new AltosIdleMonitor(this, device, remote);
 
+		status_update = new AltosFlightStatusUpdate(flightStatus);
+
+		new javax.swing.Timer(100, status_update).start();
+
 		thread.start();
 	}
 }