X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosConfigUI.java;h=a7d95903ae25d828dc14c214419ed492fdcf3e38;hp=8a8f2c0eef738affbc3f9ba838c0cf4835feaa56;hb=77b04d662a6704f5db10522a2f9b169d31df5bea;hpb=382c54a0d052c8975b57c995ef83bc8934bde242

diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java
index 8a8f2c0e..a7d95903 100644
--- a/altosui/AltosConfigUI.java
+++ b/altosui/AltosConfigUI.java
@@ -21,15 +21,15 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altosuilib_1.*;
 
 public class AltosConfigUI
-	extends AltosDialog
-	implements ActionListener, ItemListener, DocumentListener
+	extends AltosUIDialog
+	implements ActionListener, ItemListener, DocumentListener, AltosConfigValues, AltosUnitsListener
 {
 
 	Container	pane;
-	Box		box;
 	JLabel		product_label;
 	JLabel		version_label;
 	JLabel		serial_label;
@@ -40,6 +40,7 @@ public class AltosConfigUI
 	JLabel		radio_calibration_label;
 	JLabel		radio_frequency_label;
 	JLabel		radio_enable_label;
+	JLabel		aprs_interval_label;
 	JLabel		flight_log_max_label;
 	JLabel		ignite_mode_label;
 	JLabel		pad_orientation_label;
@@ -57,23 +58,33 @@ public class AltosConfigUI
 	AltosFreqList	radio_frequency_value;
 	JTextField	radio_calibration_value;
 	JRadioButton	radio_enable_value;
+	JComboBox	aprs_interval_value;
 	JComboBox	flight_log_max_value;
 	JComboBox	ignite_mode_value;
 	JComboBox	pad_orientation_value;
 	JTextField	callsign_value;
 
+	JButton		pyro;
+
 	JButton		save;
 	JButton		reset;
 	JButton		reboot;
 	JButton		close;
 
+	AltosPyro[]	pyros;
+
 	ActionListener	listener;
 
-	static String[] main_deploy_values = {
+	static String[] main_deploy_values_m = {
 		"100", "150", "200", "250", "300", "350",
 		"400", "450", "500"
 	};
 
+	static String[] main_deploy_values_ft = {
+		"250", "500", "750", "1000", "1250", "1500",
+		"1750", "2000"
+	};
+
 	static String[] apogee_delay_values = {
 		"0", "1", "2", "3", "4", "5"
 	};
@@ -94,6 +105,13 @@ public class AltosConfigUI
 		"Redundant Main",
 	};
 
+	static String[] aprs_interval_values = {
+		"Disabled",
+		"2",
+		"5",
+		"10"
+	};
+
 	static String[] pad_orientation_values = {
 		"Antenna Up",
 		"Antenna Down",
@@ -138,6 +156,13 @@ public class AltosConfigUI
 			radio_enable_value.setToolTipText("Firmware version does not support disabling radio");
 	}
 
+	void set_aprs_interval_tool_tip() {
+		if (aprs_interval_value.isEnabled())
+			aprs_interval_value.setToolTipText("Enable APRS and set the interval between APRS reports");
+		else
+			aprs_interval_value.setToolTipText("Hardware doesn't support APRS");
+	}
+
 	void set_flight_log_max_tool_tip() {
 		if (flight_log_max_value.isEnabled())
 			flight_log_max_value.setToolTipText("Size reserved for each flight log (in kB)");
@@ -160,7 +185,7 @@ public class AltosConfigUI
 
 	void set_pad_orientation_tool_tip() {
 		if (pad_orientation_value.isEnabled())
-			pad_orientation_value.setToolTipText("How will TeleMetrum be mounted in the airframe");
+			pad_orientation_value.setToolTipText("How will the computer be mounted in the airframe");
 		else {
 			if (is_telemetrum())
 				pad_orientation_value.setToolTipText("Older TeleMetrum firmware must fly antenna forward");
@@ -173,7 +198,7 @@ public class AltosConfigUI
 
 	/* Build the UI using a grid bag */
 	public AltosConfigUI(JFrame in_owner, boolean remote) {
-		super (in_owner, "Configure TeleMetrum", false);
+		super (in_owner, "Configure Flight Computer", false);
 
 		owner = in_owner;
 		GridBagConstraints c;
@@ -260,7 +285,7 @@ public class AltosConfigUI
 		c.anchor = GridBagConstraints.LINE_START;
 		c.insets = il;
 		c.ipady = 5;
-		main_deploy_label = new JLabel("Main Deploy Altitude(m):");
+		main_deploy_label = new JLabel(get_main_deploy_label());
 		pane.add(main_deploy_label, c);
 
 		c = new GridBagConstraints();
@@ -271,7 +296,7 @@ public class AltosConfigUI
 		c.anchor = GridBagConstraints.LINE_START;
 		c.insets = ir;
 		c.ipady = 5;
-		main_deploy_value = new JComboBox(main_deploy_values);
+		main_deploy_value = new JComboBox(main_deploy_values());
 		main_deploy_value.setEditable(true);
 		main_deploy_value.addItemListener(this);
 		pane.add(main_deploy_value, c);
@@ -390,7 +415,7 @@ public class AltosConfigUI
 		c.anchor = GridBagConstraints.LINE_START;
 		c.insets = il;
 		c.ipady = 5;
-		radio_enable_label = new JLabel("Telemetry/RDF Enable:");
+		radio_enable_label = new JLabel("Telemetry/RDF/APRS Enable:");
 		pane.add(radio_enable_label, c);
 
 		c = new GridBagConstraints();
@@ -407,6 +432,32 @@ public class AltosConfigUI
 		set_radio_enable_tool_tip();
 		row++;
 
+		/* APRS interval */
+		c = new GridBagConstraints();
+		c.gridx = 0; c.gridy = row;
+		c.gridwidth = 4;
+		c.fill = GridBagConstraints.NONE;
+		c.anchor = GridBagConstraints.LINE_START;
+		c.insets = il;
+		c.ipady = 5;
+		aprs_interval_label = new JLabel("APRS Interval(s):");
+		pane.add(aprs_interval_label, c);
+
+		c = new GridBagConstraints();
+		c.gridx = 4; c.gridy = row;
+		c.gridwidth = 4;
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.weightx = 1;
+		c.anchor = GridBagConstraints.LINE_START;
+		c.insets = ir;
+		c.ipady = 5;
+		aprs_interval_value = new JComboBox(aprs_interval_values);
+		aprs_interval_value.setEditable(true);
+		aprs_interval_value.addItemListener(this);
+		pane.add(aprs_interval_value, c);
+		set_aprs_interval_tool_tip();
+		row++;
+
 		/* Callsign */
 		c = new GridBagConstraints();
 		c.gridx = 0; c.gridy = row;
@@ -510,6 +561,20 @@ public class AltosConfigUI
 		set_pad_orientation_tool_tip();
 		row++;
 
+		/* Pyro channels */
+		c = new GridBagConstraints();
+		c.gridx = 4; c.gridy = row;
+		c.gridwidth = 4;
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.anchor = GridBagConstraints.LINE_START;
+		c.insets = il;
+		c.ipady = 5;
+		pyro = new JButton("Configure Pyro Channels");
+		pane.add(pyro, c);
+		pyro.addActionListener(this);
+		pyro.setActionCommand("Pyro");
+		row++;
+
 		/* Buttons */
 		c = new GridBagConstraints();
 		c.gridx = 0; c.gridy = row;
@@ -556,6 +621,7 @@ public class AltosConfigUI
 		close.setActionCommand("Close");
 
 		addWindowListener(new ConfigListener(this));
+		AltosPreferences.register_units_listener(this);
 	}
 
 	/* Once the initial values are set, the config code will show the dialog */
@@ -582,10 +648,37 @@ public class AltosConfigUI
 		return true;
 	}
 
+	void set_dirty() {
+		dirty = true;
+		save.setEnabled(true);
+	}
+
+	public void set_clean() {
+		dirty = false;
+		save.setEnabled(false);
+	}
+
+	AltosConfigPyroUI	pyro_ui;
+
+	public void dispose() {
+		if (pyro_ui != null)
+			pyro_ui.dispose();
+		AltosPreferences.unregister_units_listener(this);
+		super.dispose();
+	}
+
 	/* Listen for events from our buttons */
 	public void actionPerformed(ActionEvent e) {
 		String	cmd = e.getActionCommand();
 
+		if (cmd.equals("Pyro")) {
+			if (pyro_ui == null && pyros != null)
+				pyro_ui = new AltosConfigPyroUI(this, pyros);
+			if (pyro_ui != null)
+				pyro_ui.make_visible();
+			return;
+		}
+
 		if (cmd.equals("Close") || cmd.equals("Reboot"))
 			if (!check_dirty(cmd))
 				return;
@@ -594,25 +687,25 @@ public class AltosConfigUI
 			setVisible(false);
 			dispose();
 		}
-		dirty = false;
+		set_clean();
 	}
 
 	/* ItemListener interface method */
 	public void itemStateChanged(ItemEvent e) {
-		dirty = true;
+		set_dirty();
 	}
 
 	/* DocumentListener interface methods */
 	public void changedUpdate(DocumentEvent e) {
-		dirty = true;
+		set_dirty();
 	}
 
 	public void insertUpdate(DocumentEvent e) {
-		dirty = true;
+		set_dirty();
 	}
 
 	public void removeUpdate(DocumentEvent e) {
-		dirty = true;
+		set_dirty();
 	}
 
 	/* Let the config code hook on a listener */
@@ -638,15 +731,45 @@ public class AltosConfigUI
 	}
 
 	public void set_main_deploy(int new_main_deploy) {
-		main_deploy_value.setSelectedItem(Integer.toString(new_main_deploy));
+		main_deploy_value.setSelectedItem(AltosConvert.height.say(new_main_deploy));
+		main_deploy_value.setEnabled(new_main_deploy >= 0);
 	}
 
 	public int main_deploy() {
-		return Integer.parseInt(main_deploy_value.getSelectedItem().toString());
+		return (int) (AltosConvert.height.parse(main_deploy_value.getSelectedItem().toString()) + 0.5);
+	}
+
+	String get_main_deploy_label() {
+		return String.format("Main Deploy Altitude(%s):", AltosConvert.height.show_units());
+	}
+	
+	String[] main_deploy_values() {
+		if (AltosConvert.imperial_units)
+			return main_deploy_values_ft;
+		else
+			return main_deploy_values_m;
+	}
+			
+	void set_main_deploy_values() {
+		String[]	v = main_deploy_values();
+		while (main_deploy_value.getItemCount() > 0)
+			main_deploy_value.removeItemAt(0);
+		for (int i = 0; i < v.length; i++)
+			main_deploy_value.addItem(v[i]);
+		main_deploy_value.setMaximumRowCount(v.length);
+	}
+	
+	public void units_changed(boolean imperial_units) {
+		String v = main_deploy_value.getSelectedItem().toString();
+		main_deploy_label.setText(get_main_deploy_label());
+		set_main_deploy_values();
+		int m = (int) (AltosConvert.height.parse(v, !imperial_units) + 0.5);
+		set_main_deploy(m);
 	}
 
 	public void set_apogee_delay(int new_apogee_delay) {
 		apogee_delay_value.setSelectedItem(Integer.toString(new_apogee_delay));
+		apogee_delay_value.setEnabled(new_apogee_delay >= 0);
 	}
 
 	public int apogee_delay() {
@@ -655,6 +778,7 @@ public class AltosConfigUI
 
 	public void set_apogee_lockout(int new_apogee_lockout) {
 		apogee_lockout_value.setSelectedItem(Integer.toString(new_apogee_lockout));
+		apogee_lockout_value.setEnabled(new_apogee_lockout >= 0);
 	}
 
 	public int apogee_lockout() {
@@ -662,28 +786,7 @@ public class AltosConfigUI
 	}
 
 	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);
-		AltosUIPreferences.add_common_frequency(new_frequency);
-		radio_frequency_value.insertItemAt(new_frequency, i);
-		radio_frequency_value.setSelectedIndex(i);
+		radio_frequency_value.set_frequency(new_radio_frequency);
 	}
 
 	public double radio_frequency() {
@@ -691,7 +794,11 @@ public class AltosConfigUI
 	}
 
 	public void set_radio_calibration(int new_radio_calibration) {
-		radio_calibration_value.setText(String.format("%d", new_radio_calibration));
+		radio_calibration_value.setVisible(new_radio_calibration >= 0);
+		if (new_radio_calibration < 0)
+			radio_calibration_value.setText("Disabled");
+		else
+			radio_calibration_value.setText(String.format("%d", new_radio_calibration));
 	}
 
 	public int radio_calibration() {
@@ -704,6 +811,7 @@ public class AltosConfigUI
 			radio_enable_value.setEnabled(true);
 		} else {
 			radio_enable_value.setSelected(true);
+			radio_enable_value.setVisible(radio_frequency() > 0);
 			radio_enable_value.setEnabled(false);
 		}
 		set_radio_enable_tool_tip();
@@ -717,6 +825,7 @@ public class AltosConfigUI
 	}
 
 	public void set_callsign(String new_callsign) {
+		callsign_value.setVisible(new_callsign != null);
 		callsign_value.setText(new_callsign);
 	}
 
@@ -725,8 +834,7 @@ public class AltosConfigUI
 	}
 
 	public void set_flight_log_max(int new_flight_log_max) {
-		if (new_flight_log_max == 0)
-			flight_log_max_value.setEnabled(false);
+		flight_log_max_value.setEnabled(new_flight_log_max > 0);
 		flight_log_max_value.setSelectedItem(Integer.toString(new_flight_log_max));
 		set_flight_log_max_tool_tip();
 	}
@@ -741,12 +849,12 @@ public class AltosConfigUI
 	}
 
 	public void set_flight_log_max_limit(int flight_log_max_limit) {
-		boolean	any_added = false;
+		//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;
+				//any_added = true;
 			}
 		}
 		flight_log_max_value.addItem(String.format("%d", flight_log_max_limit));
@@ -777,10 +885,10 @@ public class AltosConfigUI
 		if (new_pad_orientation >= pad_orientation_values.length)
 			new_pad_orientation = 0;
 		if (new_pad_orientation < 0) {
-			pad_orientation_value.setEnabled(false);
+			pad_orientation_value.setVisible(false);
 			new_pad_orientation = 0;
 		} else {
-			pad_orientation_value.setEnabled(true);
+			pad_orientation_value.setVisible(true);
 		}
 		pad_orientation_value.setSelectedIndex(new_pad_orientation);
 		set_pad_orientation_tool_tip();
@@ -793,7 +901,36 @@ public class AltosConfigUI
 			return -1;
 	}
 
-	public void set_clean() {
-		dirty = false;
+	public void set_pyros(AltosPyro[] new_pyros) {
+		pyros = new_pyros;
+		pyro.setVisible(pyros != null);
+		if (pyros != null && pyro_ui != null)
+			pyro_ui.set_pyros(pyros);
+	}
+
+	public AltosPyro[] pyros() {
+		if (pyro_ui != null)
+			pyros = pyro_ui.get_pyros();
+		return pyros;
+	}
+
+	public void set_aprs_interval(int new_aprs_interval) {
+		String	s;
+
+		if (new_aprs_interval <= 0)
+			s = "Disabled";
+		else
+			s = Integer.toString(new_aprs_interval);
+		aprs_interval_value.setSelectedItem(s);
+		aprs_interval_value.setVisible(new_aprs_interval >= 0);
+		set_aprs_interval_tool_tip();
+	}
+
+	public int aprs_interval() {
+		String	s = aprs_interval_value.getSelectedItem().toString();
+
+		if (s.equals("Disabled"))
+			return 0;
+		return Integer.parseInt(s);
 	}
 }