X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosConfigFCUI.java;h=75b294d9b2c01d5acdd440d80a64350420580045;hb=3e7661761f6ea81b6a9732359edf4c5ada3e8e20;hp=5143b83754754a05edd235c1d4d6313f2f5bc97b;hpb=6b5e5899d174466552a34a4d8574f0439776240d;p=fw%2Faltos

diff --git a/altosui/AltosConfigFCUI.java b/altosui/AltosConfigFCUI.java
index 5143b837..75b294d9 100644
--- a/altosui/AltosConfigFCUI.java
+++ b/altosui/AltosConfigFCUI.java
@@ -42,6 +42,7 @@ public class AltosConfigFCUI
 	JLabel			radio_calibration_label;
 	JLabel			radio_frequency_label;
 	JLabel			radio_enable_label;
+	JLabel			radio_10mw_label;
 	JLabel			rate_label;
 	JLabel			aprs_interval_label;
 	JLabel			aprs_ssid_label;
@@ -69,6 +70,7 @@ public class AltosConfigFCUI
 	AltosUIFreqList		radio_frequency_value;
 	JLabel			radio_calibration_value;
 	JRadioButton		radio_enable_value;
+	JRadioButton		radio_10mw_value;
 	AltosUIRateList		rate_value;
 	JComboBox<String>	aprs_interval_value;
 	JComboBox<Integer>	aprs_ssid_value;
@@ -97,6 +99,8 @@ public class AltosConfigFCUI
 
 	ActionListener		listener;
 
+	static final String	title = "Configure Flight Computer";
+
 	static String[] 	main_deploy_values_m = {
 		"100", "150", "200", "250", "300", "350",
 		"400", "450", "500"
@@ -138,6 +142,9 @@ public class AltosConfigFCUI
 	};
 
 	static String[] 	beep_values = {
+		"2000",
+		"2100",
+		"2200",
 		"3750",
 		"4000",
 		"4250",
@@ -344,9 +351,16 @@ public class AltosConfigFCUI
 			beep_value.setToolTipText("Older firmware could not select beeper frequency");
 	}
 
+	void set_radio_10mw_tool_tip() {
+		if (radio_10mw_value.isVisible())
+			radio_10mw_value.setToolTipText("Should transmitter power be limited to 10mW");
+		else
+			radio_10mw_value.setToolTipText("Older firmware could not limit radio power");
+	}
+
 	/* Build the UI using a grid bag */
 	public AltosConfigFCUI(JFrame in_owner, boolean remote) {
-		super (in_owner, "Configure Flight Computer", false);
+		super (in_owner, title, false);
 
 		owner = in_owner;
 		GridBagConstraints c;
@@ -355,7 +369,8 @@ public class AltosConfigFCUI
 		Insets il = new Insets(4,4,4,4);
 		Insets ir = new Insets(4,4,4,4);
 
-		pane = getContentPane();
+		pane = getScrollablePane();
+
 		pane.setLayout(new GridBagLayout());
 
 		/* Product */
@@ -576,6 +591,31 @@ public class AltosConfigFCUI
 		set_radio_enable_tool_tip();
 		row++;
 
+		/* Radio 10mW limit */
+		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;
+		radio_10mw_label = new JLabel("Limit transmit to 10mW:");
+		pane.add(radio_10mw_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;
+		radio_10mw_value = new JRadioButton("Limited");
+		radio_10mw_value.addItemListener(this);
+		pane.add(radio_10mw_value, c);
+		set_radio_10mw_tool_tip();
+		row++;
+
 		/* Telemetry Rate */
 		c = new GridBagConstraints();
 		c.gridx = 0; c.gridy = row;
@@ -1044,11 +1084,13 @@ public class AltosConfigFCUI
 
 	public void set_dirty() {
 		dirty = true;
+		setTitle(title + " (modified)");
 		save.setEnabled(true);
 	}
 
 	public void set_clean() {
 		dirty = false;
+		setTitle(title);
 		save.setEnabled(false);
 	}
 
@@ -1076,13 +1118,13 @@ public class AltosConfigFCUI
 		if (cmd.equals("Close") || cmd.equals("Reboot"))
 			if (!check_dirty(cmd))
 				return;
+		if (cmd.equals("Save"))
+			save.setEnabled(false);
 		listener.actionPerformed(e);
 		if (cmd.equals("Close") || cmd.equals("Reboot")) {
 			setVisible(false);
 			dispose();
 		}
-		if (cmd.equals("Save") || cmd.equals("Reset"))
-			set_clean();
 	}
 
 	/* ItemListener interface method */
@@ -1430,6 +1472,22 @@ public class AltosConfigFCUI
 			return AltosLib.MISSING;
 	}
 
+	public void set_radio_10mw(int new_radio_10mw) {
+		if (new_radio_10mw != AltosLib.MISSING) {
+			radio_10mw_value.setSelected(new_radio_10mw != 0);
+		}
+		radio_10mw_value.setVisible(new_radio_10mw != AltosLib.MISSING);
+		radio_10mw_label.setVisible(new_radio_10mw != AltosLib.MISSING);
+		set_radio_10mw_tool_tip();
+	}
+
+	public int radio_10mw() {
+		if (radio_10mw_value.isVisible())
+			return radio_10mw_value.isSelected() ? 1 : 0;
+		else
+			return AltosLib.MISSING;
+	}
+
 	String[] tracker_motion_values() {
 		if (AltosConvert.imperial_units)
 			return tracker_motion_values_ft;