X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosConfigUI.java;h=de1b582ef80d6130d491ad6ac2bf5c7108720001;hb=505c6a1f8b8d68fe6f74dcb4428c860157fae3de;hp=a4e7aca6b6024b7bdff8bc653de9aa2ab2fb3066;hpb=3016ee5f21ec66bf9230b90ab1420b8fad628f8d;p=fw%2Faltos

diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java
index a4e7aca6..de1b582e 100644
--- a/altosui/AltosConfigUI.java
+++ b/altosui/AltosConfigUI.java
@@ -41,6 +41,7 @@ public class AltosConfigUI
 	JLabel			radio_frequency_label;
 	JLabel			radio_enable_label;
 	JLabel			aprs_interval_label;
+	JLabel			aprs_ssid_label;
 	JLabel			flight_log_max_label;
 	JLabel			ignite_mode_label;
 	JLabel			pad_orientation_label;
@@ -62,6 +63,7 @@ public class AltosConfigUI
 	JTextField		radio_calibration_value;
 	JRadioButton		radio_enable_value;
 	JComboBox<String>	aprs_interval_value;
+	JComboBox<Integer>	aprs_ssid_value;
 	JComboBox<String>	flight_log_max_value;
 	JComboBox<String>	ignite_mode_value;
 	JComboBox<String>	pad_orientation_value;
@@ -113,6 +115,10 @@ public class AltosConfigUI
 		"10"
 	};
 
+	static Integer[]	aprs_ssid_values = {
+		0, 1, 2 ,3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+	};
+
 	static String[] 	beep_values = {
 		"3750",
 		"4000",
@@ -201,6 +207,15 @@ public class AltosConfigUI
 			aprs_interval_value.setToolTipText("Hardware doesn't support APRS");
 	}
 
+	void set_aprs_ssid_tool_tip() {
+		if (aprs_ssid_value.isEnabled())
+			aprs_interval_value.setToolTipText("Set the APRS SSID (secondary station identifier)");
+		else if (aprs_interval_value.isEnabled())
+			aprs_interval_value.setToolTipText("Software version doesn't support setting the APRS SSID");
+		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)");
@@ -504,6 +519,33 @@ public class AltosConfigUI
 		set_aprs_interval_tool_tip();
 		row++;
 
+		/* APRS SSID */
+		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_ssid_label = new JLabel("APRS SSID:");
+		pane.add(aprs_ssid_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_ssid_value = new JComboBox<Integer>(aprs_ssid_values);
+		aprs_ssid_value.setEditable(false);
+		aprs_ssid_value.addItemListener(this);
+		aprs_ssid_value.setMaximumRowCount(aprs_ssid_values.length);
+		pane.add(aprs_ssid_value, c);
+		set_aprs_ssid_tool_tip();
+		row++;
+
 		/* Callsign */
 		c = new GridBagConstraints();
 		c.gridx = 0; c.gridy = row;
@@ -883,6 +925,8 @@ public class AltosConfigUI
 	}
 
 	public void units_changed(boolean imperial_units) {
+		boolean	was_dirty = dirty;
+
 		String v = main_deploy_value.getSelectedItem().toString();
 		main_deploy_label.setText(get_main_deploy_label());
 		set_main_deploy_values();
@@ -895,6 +939,9 @@ public class AltosConfigUI
 			set_tracker_motion_values();
 			set_tracker_motion((int) (AltosConvert.height.parse(motion, !imperial_units) + 0.5));
 		}
+
+		if (!was_dirty)
+			set_clean();
 	}
 
 	public void set_apogee_delay(int new_apogee_delay) {
@@ -1109,9 +1156,11 @@ public class AltosConfigUI
 		if (tracker_motion < 0) {
 			tracker_motion_label.setVisible(false);
 			tracker_motion_value.setVisible(false);
+			tracker_motion_value.setEnabled(false);
 		} else {
 			tracker_motion_label.setVisible(true);
 			tracker_motion_value.setVisible(true);
+			tracker_motion_value.setEnabled(true);
 			tracker_motion_value.setSelectedItem(AltosConvert.height.say(tracker_motion));
 		}
 	}
@@ -1124,9 +1173,11 @@ public class AltosConfigUI
 		if (tracker_interval< 0) {
 			tracker_interval_label.setVisible(false);
 			tracker_interval_value.setVisible(false);
+			tracker_interval_value.setEnabled(false);
 		} else {
 			tracker_interval_label.setVisible(true);
 			tracker_interval_value.setVisible(true);
+			tracker_interval_value.setEnabled(true);
 			tracker_interval_value.setSelectedItem(String.format("%d", tracker_interval));
 		}
 	}
@@ -1180,4 +1231,15 @@ public class AltosConfigUI
 			return 0;
 		return parse_int("aprs interval", s, false);
 	}
+
+	public void set_aprs_ssid(int new_aprs_ssid) {
+		aprs_ssid_value.setSelectedItem(Math.max(0,new_aprs_ssid));
+		aprs_ssid_value.setVisible(new_aprs_ssid >= 0);
+		set_aprs_ssid_tool_tip();
+	}
+
+	public int aprs_ssid() throws AltosConfigDataException {
+		Integer i = (Integer) aprs_ssid_value.getSelectedItem();
+		return i;
+	}
 }