X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=telegps%2FTeleGPSConfigUI.java;h=e5ac6d7ed4db9a3a22da6f3746af519130a4c014;hp=dfbff12d09adb6b6ffc76c80e3e2fea7b36655f1;hb=c20ddde2f9eb0ad8dbb982e9d0cbe91639160a34;hpb=3016ee5f21ec66bf9230b90ab1420b8fad628f8d

diff --git a/telegps/TeleGPSConfigUI.java b/telegps/TeleGPSConfigUI.java
index dfbff12d..e5ac6d7e 100644
--- a/telegps/TeleGPSConfigUI.java
+++ b/telegps/TeleGPSConfigUI.java
@@ -38,6 +38,7 @@ public class TeleGPSConfigUI
 	JLabel			radio_frequency_label;
 	JLabel			radio_enable_label;
 	JLabel			aprs_interval_label;
+	JLabel			aprs_ssid_label;
 	JLabel			flight_log_max_label;
 	JLabel			callsign_label;
 	JLabel			tracker_motion_label;
@@ -49,10 +50,11 @@ public class TeleGPSConfigUI
 	JLabel			product_value;
 	JLabel			version_value;
 	JLabel			serial_value;
-	AltosFreqList		radio_frequency_value;
+	AltosUIFreqList		radio_frequency_value;
 	JTextField		radio_calibration_value;
 	JRadioButton		radio_enable_value;
 	JComboBox<String>	aprs_interval_value;
+	JComboBox<Integer>	aprs_ssid_value;
 	JComboBox<String>	flight_log_max_value;
 	JTextField		callsign_value;
 	JComboBox<String>	tracker_motion_value;
@@ -72,6 +74,10 @@ public class TeleGPSConfigUI
 		"10"
 	};
 
+	static Integer[]	aprs_ssid_values = {
+		0, 1, 2 ,3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+	};
+
 	static String[]		tracker_motion_values_m = {
 		"2",
 		"5",
@@ -148,6 +154,15 @@ public class TeleGPSConfigUI
 			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)");
@@ -255,13 +270,9 @@ public class TeleGPSConfigUI
 		c.anchor = GridBagConstraints.LINE_START;
 		c.insets = ir;
 		c.ipady = 5;
-		radio_frequency_value = new AltosFreqList();
+		radio_frequency_value = new AltosUIFreqList();
 		radio_frequency_value.addItemListener(this);
-
-		JMenuBar menu_bar = new JMenuBar();
-		menu_bar.add(radio_frequency_value);
-
-		pane.add(menu_bar, c);
+		pane.add(radio_frequency_value, c);
 		radio_frequency_value.setToolTipText("Telemetry, RDF and packet frequency");
 		row++;
 
@@ -341,6 +352,33 @@ public class TeleGPSConfigUI
 		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;
@@ -570,12 +608,16 @@ public class TeleGPSConfigUI
 	}
 
 	public void units_changed(boolean imperial_units) {
+		boolean	was_dirty = dirty;
+
 		if (tracker_motion_value.isEnabled()) {
 			String motion = tracker_motion_value.getSelectedItem().toString();
 			tracker_motion_label.setText(get_tracker_motion_label());
 			set_tracker_motion_values();
 			set_tracker_motion((int) (AltosConvert.height.parse(motion, !imperial_units) + 0.5));
 		}
+		if (!was_dirty)
+			set_clean();
 	}
 
 	/* set and get all of the dialog values */
@@ -752,7 +794,12 @@ public class TeleGPSConfigUI
 	}
 
 	public void set_tracker_motion(int tracker_motion) {
-		tracker_motion_value.setSelectedItem(AltosConvert.height.say(tracker_motion));
+		if (tracker_motion < 0) {
+			tracker_motion_value.setEnabled(false);
+		} else {
+			tracker_motion_value.setEnabled(true);
+			tracker_motion_value.setSelectedItem(AltosConvert.height.say(tracker_motion));
+		}
 	}
 
 	public int tracker_motion() throws AltosConfigDataException {
@@ -760,7 +807,12 @@ public class TeleGPSConfigUI
 	}
 
 	public void set_tracker_interval(int tracker_interval) {
-		tracker_interval_value.setSelectedItem(String.format("%d", tracker_interval));
+		if (tracker_interval< 0) {
+			tracker_interval_value.setEnabled(false);
+		} else {
+			tracker_interval_value.setEnabled(true);
+			tracker_interval_value.setSelectedItem(String.format("%d", tracker_interval));
+		}
 	}
 
 	public int tracker_interval() throws AltosConfigDataException {
@@ -786,4 +838,15 @@ public class TeleGPSConfigUI
 			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;
+	}
 }