X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosScanUI.java;h=df5c51d4a2e3ab74d98dd9ad7b0a7bd7fe9bd1f8;hp=96cab73b5d85c2435882ce8acb74940b85912036;hb=31e3255b6cbfaf95c0e97e2d1ec8de72f845994c;hpb=abb8510b97ce9cbbff0275cc31f74780fe1ce138

diff --git a/altosui/AltosScanUI.java b/altosui/AltosScanUI.java
index 96cab73b..df5c51d4 100644
--- a/altosui/AltosScanUI.java
+++ b/altosui/AltosScanUI.java
@@ -30,30 +30,30 @@ import java.util.prefs.*;
 import java.util.concurrent.*;
 
 class AltosScanResult {
-	String	callsign;
-	int	serial;
-	int	flight;
-	int	channel;
-	int	telemetry;
+	String		callsign;
+	int		serial;
+	int		flight;
+	AltosFrequency	frequency;
+	int		telemetry;
 	
 	boolean	interrupted = false;
 	
 	public String toString() {
-		return String.format("%-9.9s serial %-4d flight %-4d (channel %-2d %s)",
-				     callsign, serial, flight, channel, Altos.telemetry_name(telemetry));
+		return String.format("%-9.9s serial %-4d flight %-4d (%s %s)",
+				     callsign, serial, flight, frequency.toShortString(), Altos.telemetry_name(telemetry));
 	}
 
 	public String toShortString() {
-		return String.format("%s %d %d %d %d",
-				     callsign, serial, flight, channel, telemetry);
+		return String.format("%s %d %d %7.3f %d",
+				     callsign, serial, flight, frequency, telemetry);
 	}
 
 	public AltosScanResult(String in_callsign, int in_serial,
-			       int in_flight, int in_channel, int in_telemetry) {
+			       int in_flight, AltosFrequency in_frequency, int in_telemetry) {
 		callsign = in_callsign;
 		serial = in_serial;
 		flight = in_flight;
-		channel = in_channel;
+		frequency = in_frequency;
 		telemetry = in_telemetry;
 	}
 
@@ -61,7 +61,7 @@ class AltosScanResult {
 		return (callsign.equals(other.callsign) &&
 			serial == other.serial &&
 			flight == other.flight &&
-			channel == other.channel &&
+			frequency.frequency == other.frequency.frequency &&
 			telemetry == other.telemetry);
 	}
 }
@@ -107,26 +107,30 @@ public class AltosScanUI
 {
 	AltosUI				owner;
 	AltosDevice			device;
+	AltosConfigData			config_data;
 	AltosTelemetryReader		reader;
 	private JList			list;
 	private JLabel			scanning_label;
+	private JLabel			frequency_label;
+	private JLabel			telemetry_label;
 	private JButton			cancel_button;
 	private JButton			monitor_button;
+	private JCheckBox[]		telemetry_boxes;
 	javax.swing.Timer		timer;
 	AltosScanResults		results = new AltosScanResults();
 
 	int				telemetry;
-	int				channel;
 
 	final static int		timeout = 1200;
 	TelemetryHandler		handler;
 	Thread				thread;
+	AltosFrequency[]		frequencies;
+	int				frequency_index;
 
 	void scan_exception(Exception e) {
 		if (e instanceof FileNotFoundException) {
 			JOptionPane.showMessageDialog(owner,
-						      String.format("Cannot open device \"%s\"",
-								    device.toShortString()),
+						      ((FileNotFoundException) e).getMessage(),
 						      "Cannot open target device",
 						      JOptionPane.ERROR_MESSAGE);
 		} else if (e instanceof AltosSerialInUseException) {
@@ -167,7 +171,7 @@ public class AltosScanUI
 							final AltosScanResult	result = new AltosScanResult(record.callsign,
 												     record.serial,
 												     record.flight,
-												     channel,
+												     frequencies[frequency_index],
 												     telemetry);
 							Runnable r = new Runnable() {
 									public void run() {
@@ -190,26 +194,34 @@ public class AltosScanUI
 	}
 
 	void set_label() {
-		scanning_label.setText(String.format("Scanning: channel %d %s",
-						     channel,
-						     Altos.telemetry_name(telemetry)));
+		frequency_label.setText(String.format("Frequency: %s", frequencies[frequency_index].toString()));
+		telemetry_label.setText(String.format("Telemetry: %s", Altos.telemetry_name(telemetry)));
 	}
 
-	void next() {
+	void set_telemetry() {
+		reader.set_telemetry(telemetry);
+	}
+	
+	void set_frequency() throws InterruptedException, TimeoutException {
+		reader.set_frequency(frequencies[frequency_index].frequency);
+	}
+	
+	void next() throws InterruptedException, TimeoutException {
 		reader.serial.set_monitor(false);
-		try {
-			Thread.sleep(100);
-		} catch (InterruptedException ie){
-		}
-		++channel;
-		if (channel > 9) {
-			channel = 0;
-			++telemetry;
-			if (telemetry > Altos.ao_telemetry_max)
-				telemetry = Altos.ao_telemetry_min;
-			reader.serial.set_telemetry(telemetry);
+		Thread.sleep(100);
+		++frequency_index;
+		if (frequency_index >= frequencies.length ||
+		    !telemetry_boxes[telemetry - Altos.ao_telemetry_min].isSelected())
+		{
+			frequency_index = 0;
+			do {
+				++telemetry;
+				if (telemetry > Altos.ao_telemetry_max)
+					telemetry = Altos.ao_telemetry_min;
+			} while (!telemetry_boxes[telemetry - Altos.ao_telemetry_min].isSelected());
+			set_telemetry();
 		}
-		reader.serial.set_channel(channel);
+		set_frequency();
 		set_label();
 		reader.serial.set_monitor(true);
 	}
@@ -229,31 +241,53 @@ public class AltosScanUI
 		dispose();
 	}
 
-	void tick_timer() {
+	void tick_timer() throws InterruptedException, TimeoutException {
 		next();
 	}
 
 	public void actionPerformed(ActionEvent e) {
 		String cmd = e.getActionCommand();
 
-		if (cmd.equals("cancel"))
-			close();
-
-		if (cmd.equals("tick"))
-			tick_timer();
+		try {
+			if (cmd.equals("cancel"))
+				close();
+
+			if (cmd.equals("tick"))
+				tick_timer();
+
+			if (cmd.equals("telemetry")) {
+				int k;
+				int scanning_telemetry = 0;
+				for (k = Altos.ao_telemetry_min; k <= Altos.ao_telemetry_max; k++) {
+					int j = k - Altos.ao_telemetry_min;
+					if (telemetry_boxes[j].isSelected())
+						scanning_telemetry |= (1 << k);
+				}
+				if (scanning_telemetry == 0) {
+					scanning_telemetry |= (1 << Altos.ao_telemetry_standard);
+					telemetry_boxes[Altos.ao_telemetry_standard - Altos.ao_telemetry_min].setSelected(true);
+				}
+				AltosPreferences.set_scanning_telemetry(scanning_telemetry);
+			}
 
-		if (cmd.equals("monitor")) {
-			close();
-			AltosScanResult	r = (AltosScanResult) (list.getSelectedValue());
-			if (r != null) {
-				if (device != null) {
-					if (reader != null) {
-						reader.set_telemetry(r.telemetry);
-						reader.set_channel(r.channel);
-						owner.telemetry_window(device);
+			if (cmd.equals("monitor")) {
+				close();
+				AltosScanResult	r = (AltosScanResult) (list.getSelectedValue());
+				if (r != null) {
+					if (device != null) {
+						if (reader != null) {
+							reader.set_telemetry(r.telemetry);
+							reader.set_frequency(r.frequency.frequency);
+							reader.save_frequency();
+							owner.telemetry_window(device);
+						}
 					}
 				}
 			}
+		} catch (TimeoutException te) {
+			close();
+		} catch (InterruptedException ie) {
+			close();
 		}
 	}
 
@@ -278,8 +312,8 @@ public class AltosScanUI
 			return false;
 		try {
 			reader = new AltosTelemetryReader(device);
-			reader.serial.set_channel(channel);
-			reader.serial.set_telemetry(telemetry);
+			set_frequency();
+			set_telemetry();
 			try {
 				Thread.sleep(100);
 			} catch (InterruptedException ie) {
@@ -291,8 +325,7 @@ public class AltosScanUI
 			return true;
 		} catch (FileNotFoundException ee) {
 			JOptionPane.showMessageDialog(owner,
-						      String.format("Cannot open device \"%s\"",
-								    device.toShortString()),
+						      ee.getMessage(),
 						      "Cannot open target device",
 						      JOptionPane.ERROR_MESSAGE);
 		} catch (AltosSerialInUseException si) {
@@ -306,6 +339,16 @@ public class AltosScanUI
 						      device.toShortString(),
 						      "Unkonwn I/O error",
 						      JOptionPane.ERROR_MESSAGE);
+		} catch (TimeoutException te) {
+			JOptionPane.showMessageDialog(owner,
+						      device.toShortString(),
+						      "Timeout error",
+						      JOptionPane.ERROR_MESSAGE);
+		} catch (InterruptedException ie) {
+			JOptionPane.showMessageDialog(owner,
+						      device.toShortString(),
+						      "Interrupted exception",
+						      JOptionPane.ERROR_MESSAGE);
 		}
 		if (reader != null)
 			reader.close(false);
@@ -316,7 +359,8 @@ public class AltosScanUI
 
 		owner = in_owner;
 
-		channel = 0;
+		frequencies = AltosPreferences.common_frequencies();
+		frequency_index = 0;
 		telemetry = Altos.ao_telemetry_min;
 
 		if (!open())
@@ -335,11 +379,13 @@ public class AltosScanUI
 		pane.setLayout(new GridBagLayout());
 
 		scanning_label = new JLabel("Scanning:");
+		frequency_label = new JLabel("");
+		telemetry_label = new JLabel("");
 		
 		set_label();
 
-		c.fill = GridBagConstraints.NONE;
-		c.anchor = GridBagConstraints.CENTER;
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.anchor = GridBagConstraints.WEST;
 		c.insets = i;
 		c.weightx = 1;
 		c.weighty = 1;
@@ -347,10 +393,27 @@ public class AltosScanUI
 		c.gridx = 0;
 		c.gridy = 0;
 		c.gridwidth = 2;
-		c.anchor = GridBagConstraints.CENTER;
 
 		pane.add(scanning_label, c);
+		c.gridy = 1;
+		pane.add(frequency_label, c);
+		c.gridy = 2;
+		pane.add(telemetry_label, c);
+
+		int	scanning_telemetry = AltosPreferences.scanning_telemetry();
+		telemetry_boxes = new JCheckBox[Altos.ao_telemetry_max - Altos.ao_telemetry_min + 1];
+		for (int k = Altos.ao_telemetry_min; k <= Altos.ao_telemetry_max; k++) {
+			int j = k - Altos.ao_telemetry_min;
+			telemetry_boxes[j] = new JCheckBox(Altos.ao_telemetry_name[k]);
+			c.gridy = 3 + j;
+			pane.add(telemetry_boxes[j], c);
+			telemetry_boxes[j].setActionCommand("telemetry");
+			telemetry_boxes[j].addActionListener(this);
+			telemetry_boxes[j].setSelected((scanning_telemetry & (1 << k)) != 0);
+		}
 
+		int	y_offset = 3 + (Altos.ao_telemetry_max - Altos.ao_telemetry_min + 1);
+				
 		list = new JList(results) {
 				//Subclass JList to workaround bug 4832765, which can cause the
 				//scroll pane to not let the user easily scroll up to the beginning
@@ -417,7 +480,7 @@ public class AltosScanUI
 		c.weighty = 1;
 
 		c.gridx = 0;
-		c.gridy = 1;
+		c.gridy = y_offset;
 		c.gridwidth = 2;
 		c.anchor = GridBagConstraints.CENTER;
 
@@ -434,7 +497,7 @@ public class AltosScanUI
 		c.weighty = 1;
 
 		c.gridx = 0;
-		c.gridy = 2;
+		c.gridy = y_offset + 1;
 		c.gridwidth = 1;
 		c.anchor = GridBagConstraints.CENTER;
 
@@ -451,7 +514,7 @@ public class AltosScanUI
 		c.weighty = 1;
 
 		c.gridx = 1;
-		c.gridy = 2;
+		c.gridy = y_offset + 1;
 		c.gridwidth = 1;
 		c.anchor = GridBagConstraints.CENTER;