X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosConfigFCUI.java;h=b4c37e0bff7143f8163c3df5cc8683a6efa09600;hb=refs%2Fheads%2Fbranch-1.9;hp=5ccb107783a9a7922cf17f85c73ee5f86115b654;hpb=c1b754c12ac32ed38a561d8b35dcbdf82beea896;p=fw%2Faltos

diff --git a/altosui/AltosConfigFCUI.java b/altosui/AltosConfigFCUI.java
index 5ccb1077..3e5bede5 100644
--- a/altosui/AltosConfigFCUI.java
+++ b/altosui/AltosConfigFCUI.java
@@ -42,6 +42,9 @@ public class AltosConfigFCUI
 	JLabel			radio_calibration_label;
 	JLabel			radio_frequency_label;
 	JLabel			radio_enable_label;
+	JLabel			radio_10mw_label;
+	JLabel			report_feet_label;
+	JLabel			gps_receiver_label;
 	JLabel			rate_label;
 	JLabel			aprs_interval_label;
 	JLabel			aprs_ssid_label;
@@ -69,6 +72,9 @@ public class AltosConfigFCUI
 	AltosUIFreqList		radio_frequency_value;
 	JLabel			radio_calibration_value;
 	JRadioButton		radio_enable_value;
+	JRadioButton		radio_10mw_value;
+	JComboBox<String>	report_feet_value;
+	JComboBox<String>	gps_receiver_value;
 	AltosUIRateList		rate_value;
 	JComboBox<String>	aprs_interval_value;
 	JComboBox<Integer>	aprs_ssid_value;
@@ -140,6 +146,9 @@ public class AltosConfigFCUI
 	};
 
 	static String[] 	beep_values = {
+		"2000",
+		"2100",
+		"2200",
 		"3750",
 		"4000",
 		"4250",
@@ -178,6 +187,11 @@ public class AltosConfigFCUI
 		"10"
 	};
 
+	static String[] 	report_feet_values = {
+		"Meters",
+		"Feet",
+	};
+
 	/* A window listener to catch closing events and tell the config code */
 	class ConfigListener extends WindowAdapter {
 		AltosConfigFCUI	ui;
@@ -228,7 +242,7 @@ public class AltosConfigFCUI
 		return product != null && product.startsWith("EasyTimer");
 	}
 
-	boolean has_radio() {
+	public boolean has_radio() {
 		return is_telemega() || is_telemetrum() || is_telemini();
 	}
 
@@ -341,11 +355,32 @@ public class AltosConfigFCUI
 
 	void set_beep_tool_tip() {
 		if (beep_value.isVisible())
-			beep_value.setToolTipText("What frequency the beeper will sound at");
+			beep_value.setToolTipText("What frequency the beeper will sound at (0 for off)");
 		else
 			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");
+	}
+
+	void set_report_feet_tool_tip() {
+		if (report_feet_value.isVisible())
+			report_feet_value.setToolTipText("Units used after landing to beep max height");
+		else
+			report_feet_value.setToolTipText("Older firmware always beeps max height in meters");
+	}
+
+	void set_gps_receiver_tool_tip() {
+		if (gps_receiver_value.isVisible())
+			gps_receiver_value.setToolTipText("GPS receiver selection");
+		else
+			gps_receiver_value.setToolTipText("Only TeleMega with new firmware supports alternate GPS receivers");
+	}
+
 	/* Build the UI using a grid bag */
 	public AltosConfigFCUI(JFrame in_owner, boolean remote) {
 		super (in_owner, title, false);
@@ -357,7 +392,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 */
@@ -578,6 +614,83 @@ 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++;
+
+		/* Report feet */
+		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;
+		report_feet_label = new JLabel("Beep max height in:");
+		pane.add(report_feet_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;
+		report_feet_value = new JComboBox<String>(report_feet_values);
+		report_feet_value.setEditable(false);
+		report_feet_value.addItemListener(this);
+		pane.add(report_feet_value, c);
+		set_report_feet_tool_tip();
+		row++;
+
+		/* GPS Receiver */
+		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;
+		gps_receiver_label = new JLabel("GPS Receiver:");
+		pane.add(gps_receiver_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;
+		gps_receiver_value = new JComboBox<String>(AltosLib.gps_receiver_names);
+		gps_receiver_value.setEditable(false);
+		gps_receiver_value.addItemListener(this);
+		pane.add(gps_receiver_value, c);
+		set_gps_receiver_tool_tip();
+		row++;
+
 		/* Telemetry Rate */
 		c = new GridBagConstraints();
 		c.gridx = 0; c.gridy = row;
@@ -1434,6 +1547,73 @@ 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;
+	}
+
+	public void set_report_feet(int new_report_feet) {
+		if (new_report_feet != AltosLib.MISSING) {
+			if (new_report_feet >= report_feet_values.length)
+				new_report_feet = 0;
+			if (new_report_feet < 0) {
+				report_feet_value.setEnabled(false);
+				new_report_feet = 0;
+			} else {
+				report_feet_value.setEnabled(true);
+			}
+			report_feet_value.setSelectedIndex(new_report_feet);
+		}
+		report_feet_value.setVisible(new_report_feet != AltosLib.MISSING);
+		report_feet_label.setVisible(new_report_feet != AltosLib.MISSING);
+
+		set_report_feet_tool_tip();
+	}
+
+	public int report_feet() {
+		if (report_feet_value.isVisible())
+			return report_feet_value.getSelectedIndex();
+		else
+			return AltosLib.MISSING;
+	}
+
+	public void set_gps_receiver(int new_gps_receiver) {
+		System.out.printf("set_gps_receiver %d\n", new_gps_receiver);
+		if (new_gps_receiver != AltosLib.MISSING) {
+			if (new_gps_receiver >= AltosLib.gps_receiver_names.length)
+				new_gps_receiver = 0;
+			if (new_gps_receiver < 0) {
+				gps_receiver_value.setEnabled(false);
+				new_gps_receiver = 0;
+			} else {
+				gps_receiver_value.setEnabled(true);
+			}
+			gps_receiver_value.setSelectedIndex(new_gps_receiver);
+		}
+		gps_receiver_value.setVisible(new_gps_receiver != AltosLib.MISSING);
+		gps_receiver_label.setVisible(new_gps_receiver != AltosLib.MISSING);
+
+		set_gps_receiver_tool_tip();
+	}
+
+	public int gps_receiver() {
+		if (gps_receiver_value.isVisible())
+			return gps_receiver_value.getSelectedIndex();
+		else
+			return AltosLib.MISSING;
+	}
+
 	String[] tracker_motion_values() {
 		if (AltosConvert.imperial_units)
 			return tracker_motion_values_ft;