X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosConfigUI.java;h=63e0ba78888105e32b8c746acb5b0918e5fddd91;hp=1a48c1d38167914922058175de6240967edb9191;hb=ef7f60df841f1eb22b9cec0d7f68cf2c003d6b30;hpb=6492218fc316f8cf6214a577807a8dd0a80a9b6a

diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java
index 1a48c1d3..63e0ba78 100644
--- a/altosui/AltosConfigUI.java
+++ b/altosui/AltosConfigUI.java
@@ -43,8 +43,9 @@ public class AltosConfigUI
 	JLabel		serial_label;
 	JLabel		main_deploy_label;
 	JLabel		apogee_delay_label;
-	JLabel		radio_channel_label;
+	JLabel		frequency_label;
 	JLabel		radio_calibration_label;
+	JLabel		radio_frequency_label;
 	JLabel		flight_log_max_label;
 	JLabel		ignite_mode_label;
 	JLabel		pad_orientation_label;
@@ -58,7 +59,7 @@ public class AltosConfigUI
 	JLabel		serial_value;
 	JComboBox	main_deploy_value;
 	JComboBox	apogee_delay_value;
-	JComboBox	radio_channel_value;
+	AltosFreqList	radio_frequency_value;
 	JTextField	radio_calibration_value;
 	JComboBox	flight_log_max_value;
 	JComboBox	ignite_mode_value;
@@ -98,13 +99,6 @@ public class AltosConfigUI
 		"Antenna Down",
 	};
 
-	static String[] radio_channel_values = new String[10];
-		{
-			for (int i = 0; i <= 9; i++)
-				radio_channel_values[i] = String.format("Channel %1d (%7.3fMHz)",
-									i, 434.550 + i * 0.1);
-		}
-
 	/* A window listener to catch closing events and tell the config code */
 	class ConfigListener extends WindowAdapter {
 		AltosConfigUI	ui;
@@ -245,7 +239,7 @@ public class AltosConfigUI
 		apogee_delay_value.addItemListener(this);
 		pane.add(apogee_delay_value, c);
 
-		/* Radio channel */
+		/* Frequency */
 		c = new GridBagConstraints();
 		c.gridx = 0; c.gridy = 5;
 		c.gridwidth = 4;
@@ -253,8 +247,8 @@ public class AltosConfigUI
 		c.anchor = GridBagConstraints.LINE_START;
 		c.insets = il;
 		c.ipady = 5;
-		radio_channel_label = new JLabel("Radio Channel:");
-		pane.add(radio_channel_label, c);
+		radio_frequency_label = new JLabel("Frequency:");
+		pane.add(radio_frequency_label, c);
 
 		c = new GridBagConstraints();
 		c.gridx = 4; c.gridy = 5;
@@ -264,10 +258,9 @@ public class AltosConfigUI
 		c.anchor = GridBagConstraints.LINE_START;
 		c.insets = ir;
 		c.ipady = 5;
-		radio_channel_value = new JComboBox(radio_channel_values);
-		radio_channel_value.setEditable(false);
-		radio_channel_value.addItemListener(this);
-		pane.add(radio_channel_value, c);
+		radio_frequency_value = new AltosFreqList();
+		radio_frequency_value.addItemListener(this);
+		pane.add(radio_frequency_value, c);
 
 		/* Radio Calibration */
 		c = new GridBagConstraints();
@@ -501,6 +494,7 @@ public class AltosConfigUI
 
 	/* set and get all of the dialog values */
 	public void set_product(String product) {
+		radio_frequency_value.set_product(product);
 		product_value.setText(product);
 	}
 
@@ -509,6 +503,7 @@ public class AltosConfigUI
 	}
 
 	public void set_serial(int serial) {
+		radio_frequency_value.set_serial(serial);
 		serial_value.setText(String.format("%d", serial));
 	}
 
@@ -528,12 +523,32 @@ public class AltosConfigUI
 		return Integer.parseInt(apogee_delay_value.getSelectedItem().toString());
 	}
 
-	public void set_radio_channel(int new_radio_channel) {
-		radio_channel_value.setSelectedIndex(new_radio_channel);
+	public void set_radio_frequency(double new_radio_frequency) {
+		int i;
+		for (i = 0; i < radio_frequency_value.getItemCount(); i++) {
+			AltosFrequency	f = (AltosFrequency) radio_frequency_value.getItemAt(i);
+			
+			if (f.close(new_radio_frequency)) {
+				radio_frequency_value.setSelectedIndex(i);
+				return;
+			}
+		}
+		for (i = 0; i < radio_frequency_value.getItemCount(); i++) {
+			AltosFrequency	f = (AltosFrequency) radio_frequency_value.getItemAt(i);
+			
+			if (new_radio_frequency < f.frequency)
+				break;
+		}
+		String	description = String.format("%s serial %s",
+						    product_value.getText(),
+						    serial_value.getText());
+		AltosFrequency	new_frequency = new AltosFrequency(new_radio_frequency, description);
+		AltosPreferences.add_common_frequency(new_frequency);
+		radio_frequency_value.insertItemAt(new_frequency, i);
 	}
 
-	public int radio_channel() {
-		return radio_channel_value.getSelectedIndex();
+	public double radio_frequency() {
+		return radio_frequency_value.frequency();
 	}
 
 	public void set_radio_calibration(int new_radio_calibration) {
@@ -562,6 +577,18 @@ public class AltosConfigUI
 		return Integer.parseInt(flight_log_max_value.getSelectedItem().toString());
 	}
 
+	public void set_flight_log_max_limit(int flight_log_max_limit) {
+		boolean	any_added = false;
+		flight_log_max_value.removeAllItems();
+		for (int i = 0; i < flight_log_max_values.length; i++) {
+			if (Integer.parseInt(flight_log_max_values[i]) < flight_log_max_limit){
+				flight_log_max_value.addItem(flight_log_max_values[i]);
+				any_added = true;
+			}
+		}
+		flight_log_max_value.addItem(String.format("%d", flight_log_max_limit));
+	}
+
 	public void set_ignite_mode(int new_ignite_mode) {
 		if (new_ignite_mode < 0) {
 			ignite_mode_value.setEnabled(false);
@@ -573,7 +600,10 @@ public class AltosConfigUI
 	}
 
 	public int ignite_mode() {
-		return ignite_mode_value.getSelectedIndex();
+		if (ignite_mode_value.isEnabled())
+			return ignite_mode_value.getSelectedIndex();
+		else
+			return -1;
 	}
 
 
@@ -588,7 +618,10 @@ public class AltosConfigUI
 	}
 
 	public int pad_orientation() {
-		return pad_orientation_value.getSelectedIndex();
+		if (pad_orientation_value.isEnabled())
+			return pad_orientation_value.getSelectedIndex();
+		else
+			return -1;
 	}
 
 	public void set_clean() {