X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosConfigUI.java;h=e3a1a24fe2f46dcebef5171006d8d805b36c0c55;hb=efb86669b5a74f244e2218f3385db633c36208af;hp=ee54e31e30c32fe7457a7ab516c80d332f6ddbd8;hpb=5f2029bd4e31289fb03e6af39abdbc16f8b8fa78;p=fw%2Faltos

diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java
index ee54e31e..e3a1a24f 100644
--- a/altosui/AltosConfigUI.java
+++ b/altosui/AltosConfigUI.java
@@ -21,8 +21,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.altoslib_4.*;
-import org.altusmetrum.altosuilib_2.*;
+import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altosuilib_3.*;
 
 public class AltosConfigUI
 	extends AltosUIDialog
@@ -40,7 +40,9 @@ public class AltosConfigUI
 	JLabel			radio_calibration_label;
 	JLabel			radio_frequency_label;
 	JLabel			radio_enable_label;
+	JLabel			rate_label;
 	JLabel			aprs_interval_label;
+	JLabel			aprs_ssid_label;
 	JLabel			flight_log_max_label;
 	JLabel			ignite_mode_label;
 	JLabel			pad_orientation_label;
@@ -58,10 +60,12 @@ public class AltosConfigUI
 	JComboBox<String>	main_deploy_value;
 	JComboBox<String>	apogee_delay_value;
 	JComboBox<String>	apogee_lockout_value;
-	AltosFreqList		radio_frequency_value;
+	AltosUIFreqList		radio_frequency_value;
 	JTextField		radio_calibration_value;
 	JRadioButton		radio_enable_value;
+	AltosUIRateList		rate_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;
@@ -78,6 +82,7 @@ public class AltosConfigUI
 	JButton			close;
 
 	AltosPyro[]		pyros;
+	double			pyro_firing_time;
 
 	ActionListener		listener;
 
@@ -112,6 +117,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",
@@ -193,6 +202,13 @@ public class AltosConfigUI
 			radio_enable_value.setToolTipText("Firmware version does not support disabling radio");
 	}
 
+	void set_rate_tool_tip() {
+		if (rate_value.isEnabled())
+			rate_value.setToolTipText("Select telemetry baud rate");
+		else
+			rate_value.setToolTipText("Firmware version does not support variable telemetry rates");
+	}
+
 	void set_aprs_interval_tool_tip() {
 		if (aprs_interval_value.isEnabled())
 			aprs_interval_value.setToolTipText("Enable APRS and set the interval between APRS reports");
@@ -200,6 +216,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)");
@@ -416,7 +441,7 @@ public class AltosConfigUI
 		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);
 		pane.add(radio_frequency_value, c);
 		radio_frequency_value.setToolTipText("Telemetry, RDF and packet frequency");
@@ -474,6 +499,31 @@ public class AltosConfigUI
 		set_radio_enable_tool_tip();
 		row++;
 
+		/* Telemetry Rate */
+		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;
+		rate_label = new JLabel("Telemetry baud rate:");
+		pane.add(radio_enable_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;
+		rate_value = new AltosUIRateList();
+		rate_value.addItemListener(this);
+		pane.add(rate_value, c);
+		set_rate_tool_tip();
+		row++;
+
 		/* APRS interval */
 		c = new GridBagConstraints();
 		c.gridx = 0; c.gridy = row;
@@ -500,6 +550,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;
@@ -792,7 +869,7 @@ public class AltosConfigUI
 
 		if (cmd.equals("Pyro")) {
 			if (pyro_ui == null && pyros != null)
-				pyro_ui = new AltosConfigPyroUI(this, pyros);
+				pyro_ui = new AltosConfigPyroUI(this, pyros, pyro_firing_time);
 			if (pyro_ui != null)
 				pyro_ui.make_visible();
 			return;
@@ -879,6 +956,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();
@@ -891,6 +970,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) {
@@ -961,6 +1043,14 @@ public class AltosConfigUI
 			return -1;
 	}
 
+	public void set_telemetry_rate(int new_rate) {
+		rate_value.set_rate(new_rate);
+	}
+
+	public int telemetry_rate() {
+		return rate_value.rate();
+	}
+
 	public void set_callsign(String new_callsign) {
 		callsign_value.setVisible(new_callsign != null);
 		callsign_value.setText(new_callsign);
@@ -1102,7 +1192,16 @@ public class AltosConfigUI
 	}
 
 	public void set_tracker_motion(int tracker_motion) {
-		tracker_motion_value.setSelectedItem(AltosConvert.height.say(tracker_motion));
+		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));
+		}
 	}
 
 	public int tracker_motion() throws AltosConfigDataException {
@@ -1110,7 +1209,16 @@ public class AltosConfigUI
 	}
 
 	public void set_tracker_interval(int tracker_interval) {
-		tracker_interval_value.setSelectedItem(String.format("%d", tracker_interval));
+		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));
+		}
 	}
 
 	public int tracker_interval() throws AltosConfigDataException {
@@ -1130,6 +1238,19 @@ public class AltosConfigUI
 		return pyros;
 	}
 
+	public void set_pyro_firing_time(double new_pyro_firing_time) {
+		pyro_firing_time = new_pyro_firing_time;
+		pyro.setVisible(pyro_firing_time >= 0);
+		if (pyro_firing_time >= 0 && pyro_ui != null)
+			pyro_ui.set_pyro_firing_time(pyro_firing_time);
+	}
+
+	public double pyro_firing_time() throws AltosConfigDataException {
+		if (pyro_ui != null)
+			pyro_firing_time = pyro_ui.get_pyro_firing_time();
+		return pyro_firing_time;
+	}
+
 	public void set_aprs_interval(int new_aprs_interval) {
 		String	s;
 
@@ -1149,4 +1270,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;
+	}
 }