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

diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java
index f835ee2e..1a48c1d3 100644
--- a/altosui/AltosConfigUI.java
+++ b/altosui/AltosConfigUI.java
@@ -46,6 +46,8 @@ public class AltosConfigUI
 	JLabel		radio_channel_label;
 	JLabel		radio_calibration_label;
 	JLabel		flight_log_max_label;
+	JLabel		ignite_mode_label;
+	JLabel		pad_orientation_label;
 	JLabel		callsign_label;
 
 	public boolean		dirty;
@@ -59,6 +61,8 @@ public class AltosConfigUI
 	JComboBox	radio_channel_value;
 	JTextField	radio_calibration_value;
 	JComboBox	flight_log_max_value;
+	JComboBox	ignite_mode_value;
+	JComboBox	pad_orientation_value;
 	JTextField	callsign_value;
 
 	JButton		save;
@@ -83,6 +87,17 @@ public class AltosConfigUI
 		"704", "768", "832", "896", "960",
 	};
 
+	static String[] ignite_mode_values = {
+		"Dual Deploy",
+		"Redundant Apogee",
+		"Redundant Main",
+	};
+
+	static String[] pad_orientation_values = {
+		"Antenna Up",
+		"Antenna Down",
+	};
+
 	static String[] radio_channel_values = new String[10];
 		{
 			for (int i = 0; i <= 9; i++)
@@ -326,9 +341,57 @@ public class AltosConfigUI
 		flight_log_max_value.addItemListener(this);
 		pane.add(flight_log_max_value, c);
 
-		/* Buttons */
+		/* Ignite mode */
 		c = new GridBagConstraints();
 		c.gridx = 0; c.gridy = 9;
+		c.gridwidth = 4;
+		c.fill = GridBagConstraints.NONE;
+		c.anchor = GridBagConstraints.LINE_START;
+		c.insets = il;
+		c.ipady = 5;
+		ignite_mode_label = new JLabel("Igniter Firing Mode:");
+		pane.add(ignite_mode_label, c);
+
+		c = new GridBagConstraints();
+		c.gridx = 4; c.gridy = 9;
+		c.gridwidth = 4;
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.weightx = 1;
+		c.anchor = GridBagConstraints.LINE_START;
+		c.insets = ir;
+		c.ipady = 5;
+		ignite_mode_value = new JComboBox(ignite_mode_values);
+		ignite_mode_value.setEditable(false);
+		ignite_mode_value.addItemListener(this);
+		pane.add(ignite_mode_value, c);
+
+		/* Pad orientation */
+		c = new GridBagConstraints();
+		c.gridx = 0; c.gridy = 10;
+		c.gridwidth = 4;
+		c.fill = GridBagConstraints.NONE;
+		c.anchor = GridBagConstraints.LINE_START;
+		c.insets = il;
+		c.ipady = 5;
+		pad_orientation_label = new JLabel("Pad Orientation:");
+		pane.add(pad_orientation_label, c);
+
+		c = new GridBagConstraints();
+		c.gridx = 4; c.gridy = 10;
+		c.gridwidth = 4;
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.weightx = 1;
+		c.anchor = GridBagConstraints.LINE_START;
+		c.insets = ir;
+		c.ipady = 5;
+		pad_orientation_value = new JComboBox(pad_orientation_values);
+		pad_orientation_value.setEditable(false);
+		pad_orientation_value.addItemListener(this);
+		pane.add(pad_orientation_value, c);
+
+		/* Buttons */
+		c = new GridBagConstraints();
+		c.gridx = 0; c.gridy = 11;
 		c.gridwidth = 2;
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.LINE_START;
@@ -339,7 +402,7 @@ public class AltosConfigUI
 		save.setActionCommand("Save");
 
 		c = new GridBagConstraints();
-		c.gridx = 2; c.gridy = 9;
+		c.gridx = 2; c.gridy = 11;
 		c.gridwidth = 2;
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.CENTER;
@@ -350,7 +413,7 @@ public class AltosConfigUI
 		reset.setActionCommand("Reset");
 
 		c = new GridBagConstraints();
-		c.gridx = 4; c.gridy = 9;
+		c.gridx = 4; c.gridy = 11;
 		c.gridwidth = 2;
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.CENTER;
@@ -361,7 +424,7 @@ public class AltosConfigUI
 		reboot.setActionCommand("Reboot");
 
 		c = new GridBagConstraints();
-		c.gridx = 6; c.gridy = 9;
+		c.gridx = 6; c.gridy = 11;
 		c.gridwidth = 2;
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.LINE_END;
@@ -499,6 +562,35 @@ public class AltosConfigUI
 		return Integer.parseInt(flight_log_max_value.getSelectedItem().toString());
 	}
 
+	public void set_ignite_mode(int new_ignite_mode) {
+		if (new_ignite_mode < 0) {
+			ignite_mode_value.setEnabled(false);
+			new_ignite_mode = 0;
+		} else {
+			ignite_mode_value.setEnabled(true);
+		}
+		ignite_mode_value.setSelectedIndex(new_ignite_mode);
+	}
+
+	public int ignite_mode() {
+		return ignite_mode_value.getSelectedIndex();
+	}
+
+
+	public void set_pad_orientation(int new_pad_orientation) {
+		if (new_pad_orientation < 0) {
+			pad_orientation_value.setEnabled(false);
+			new_pad_orientation = 0;
+		} else {
+			pad_orientation_value.setEnabled(true);
+		}
+		pad_orientation_value.setSelectedIndex(new_pad_orientation);
+	}
+
+	public int pad_orientation() {
+		return pad_orientation_value.getSelectedIndex();
+	}
+
 	public void set_clean() {
 		dirty = false;
 	}