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

diff --git a/altosui/AltosScanUI.java b/altosui/AltosScanUI.java
index e55f317c..df5c51d4 100644
--- a/altosui/AltosScanUI.java
+++ b/altosui/AltosScanUI.java
@@ -30,29 +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 %4d %4d %2d %2d",
-				     callsign, serial, flight, channel, 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;
 	}
 
@@ -60,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);
 	}
 }
@@ -104,30 +105,32 @@ public class AltosScanUI
 	extends JDialog
 	implements ActionListener
 {
-	JFrame				owner;
+	AltosUI				owner;
 	AltosDevice			device;
+	AltosConfigData			config_data;
 	AltosTelemetryReader		reader;
 	private JList			list;
-	private JLabel			channel_label;
-	private JLabel			monitor_label;
-	private JButton			ok_button;
+	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();
 
-	static final int[]		monitors = { Altos.ao_telemetry_split_len,
-						     Altos.ao_telemetry_legacy_len };
-	int				monitor;
-	int				channel;
+	int				telemetry;
 
-	final static int		timeout = 5 * 1000;
+	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) {
@@ -163,17 +166,21 @@ public class AltosScanUI
 					try {
 						AltosRecord	record = reader.read();
 						if (record == null)
-							break;
+							continue;
 						if ((record.seen & AltosRecord.seen_flight) != 0) {
-							AltosScanResult	result = new AltosScanResult(record.callsign,
+							final AltosScanResult	result = new AltosScanResult(record.callsign,
 												     record.serial,
 												     record.flight,
-												     channel,
-												     monitor);
-							results.add(result);
+												     frequencies[frequency_index],
+												     telemetry);
+							Runnable r = new Runnable() {
+									public void run() {
+										results.add(result);
+									}
+								};
+							SwingUtilities.invokeLater(r);
 						}
 					} catch (ParseException pp) {
-						System.out.printf("Parse error: %d \"%s\"\n", pp.getErrorOffset(), pp.getMessage());
 					} catch (AltosCRCException ce) {
 					}
 				}
@@ -186,24 +193,37 @@ public class AltosScanUI
 		}
 	}
 
-	void set_channel() {
-		reader.serial.set_channel(channel);
+	void set_label() {
+		frequency_label.setText(String.format("Frequency: %s", frequencies[frequency_index].toString()));
+		telemetry_label.setText(String.format("Telemetry: %s", Altos.telemetry_name(telemetry)));
 	}
 
-	void set_monitor() {
-		reader.serial.set_telemetry(monitors[monitor]);
+	void set_telemetry() {
+		reader.set_telemetry(telemetry);
 	}
-
-	void next() {
-		++channel;
-		if (channel == 10) {
-			channel = 0;
-			++monitor;
-			if (monitor == monitors.length)
-				monitor = 0;
-			set_monitor();
+	
+	void set_frequency() throws InterruptedException, TimeoutException {
+		reader.set_frequency(frequencies[frequency_index].frequency);
+	}
+	
+	void next() throws InterruptedException, TimeoutException {
+		reader.serial.set_monitor(false);
+		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();
 		}
-		set_channel();
+		set_frequency();
+		set_label();
+		reader.serial.set_monitor(true);
 	}
 
 
@@ -221,14 +241,52 @@ 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("close")) {
+		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_frequency(r.frequency.frequency);
+							reader.save_frequency();
+							owner.telemetry_window(device);
+						}
+					}
+				}
+			}
+		} catch (TimeoutException te) {
+			close();
+		} catch (InterruptedException ie) {
 			close();
 		}
 	}
@@ -249,27 +307,62 @@ public class AltosScanUI
 	}
 
 	private boolean open() {
-		device = AltosDeviceDialog.show(owner, Altos.product_any);
-		if (device != null) {
+		device = AltosDeviceDialog.show(owner, Altos.product_basestation);
+		if (device == null)
+			return false;
+		try {
+			reader = new AltosTelemetryReader(device);
+			set_frequency();
+			set_telemetry();
 			try {
-				reader = new AltosTelemetryReader(device);
-				set_channel();
-				set_monitor();
-				handler = new TelemetryHandler();
-				thread = new Thread(handler);
-				thread.start();
-				return true;
-			} catch (Exception e) {
-				scan_exception(e);
+				Thread.sleep(100);
+			} catch (InterruptedException ie) {
 			}
+			reader.flush();
+			handler = new TelemetryHandler();
+			thread = new Thread(handler);
+			thread.start();
+			return true;
+		} catch (FileNotFoundException ee) {
+			JOptionPane.showMessageDialog(owner,
+						      ee.getMessage(),
+						      "Cannot open target device",
+						      JOptionPane.ERROR_MESSAGE);
+		} catch (AltosSerialInUseException si) {
+			JOptionPane.showMessageDialog(owner,
+						      String.format("Device \"%s\" already in use",
+								    device.toShortString()),
+						      "Device in use",
+						      JOptionPane.ERROR_MESSAGE);
+		} catch (IOException ee) {
+			JOptionPane.showMessageDialog(owner,
+						      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);
 		return false;
 	}
 
-	public AltosScanUI(JFrame in_owner) {
+	public AltosScanUI(AltosUI in_owner) {
 
 		owner = in_owner;
 
+		frequencies = AltosPreferences.common_frequencies();
+		frequency_index = 0;
+		telemetry = Altos.ao_telemetry_min;
+
 		if (!open())
 			return;
 
@@ -285,17 +378,42 @@ public class AltosScanUI
 
 		pane.setLayout(new GridBagLayout());
 
-		c.fill = GridBagConstraints.NONE;
-		c.anchor = GridBagConstraints.CENTER;
+		scanning_label = new JLabel("Scanning:");
+		frequency_label = new JLabel("");
+		telemetry_label = new JLabel("");
+		
+		set_label();
+
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.anchor = GridBagConstraints.WEST;
 		c.insets = i;
 		c.weightx = 1;
 		c.weighty = 1;
 
 		c.gridx = 0;
 		c.gridy = 0;
-		c.gridwidth = 3;
-		c.anchor = GridBagConstraints.CENTER;
+		c.gridwidth = 2;
+
+		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
@@ -330,13 +448,13 @@ public class AltosScanUI
 		list.setLayoutOrientation(JList.HORIZONTAL_WRAP);
 		list.setVisibleRowCount(-1);
 
-//		list.addMouseListener(new MouseAdapter() {
-//				 public void mouseClicked(MouseEvent e) {
-//					 if (e.getClickCount() == 2) {
-//						 select_button.doClick(); //emulate button click
-//					 }
-//				 }
-//			});
+		list.addMouseListener(new MouseAdapter() {
+				 public void mouseClicked(MouseEvent e) {
+					 if (e.getClickCount() == 2) {
+						 monitor_button.doClick(); //emulate button click
+					 }
+				 }
+			});
 		JScrollPane listScroller = new JScrollPane(list);
 		listScroller.setPreferredSize(new Dimension(400, 80));
 		listScroller.setAlignmentX(LEFT_ALIGNMENT);
@@ -355,11 +473,58 @@ public class AltosScanUI
 		listPane.add(listScroller);
 		listPane.setBorder(BorderFactory.createEmptyBorder(10,10,10,10));
 
+		c.fill = GridBagConstraints.BOTH;
+		c.anchor = GridBagConstraints.CENTER;
+		c.insets = i;
+		c.weightx = 1;
+		c.weighty = 1;
+
+		c.gridx = 0;
+		c.gridy = y_offset;
+		c.gridwidth = 2;
+		c.anchor = GridBagConstraints.CENTER;
+
 		pane.add(listPane, c);
 
+		cancel_button = new JButton("Cancel");
+		cancel_button.addActionListener(this);
+		cancel_button.setActionCommand("cancel");
+
+		c.fill = GridBagConstraints.NONE;
+		c.anchor = GridBagConstraints.CENTER;
+		c.insets = i;
+		c.weightx = 1;
+		c.weighty = 1;
+
+		c.gridx = 0;
+		c.gridy = y_offset + 1;
+		c.gridwidth = 1;
+		c.anchor = GridBagConstraints.CENTER;
+
+		pane.add(cancel_button, c);
+
+		monitor_button = new JButton("Monitor");
+		monitor_button.addActionListener(this);
+		monitor_button.setActionCommand("monitor");
+
+		c.fill = GridBagConstraints.NONE;
+		c.anchor = GridBagConstraints.CENTER;
+		c.insets = i;
+		c.weightx = 1;
+		c.weighty = 1;
+
+		c.gridx = 1;
+		c.gridy = y_offset + 1;
+		c.gridwidth = 1;
+		c.anchor = GridBagConstraints.CENTER;
+
+		pane.add(monitor_button, c);
+
 		pack();
 		setLocationRelativeTo(owner);
 
 		addWindowListener(new ConfigListener(this));
+
+		setVisible(true);
 	}
 }
\ No newline at end of file