X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosConfigFCUI.java;h=2eb6ae752c73f70ba7eed833ebce4ff1ab95eda2;hb=f32488556ce25e439fbab941f8019db639824f98;hp=1e875dec1aa9b490622fd0d2d371f306b43f0936;hpb=a4dfaf25954134dbdc7229e2de39d4a4c049f285;p=fw%2Faltos

diff --git a/altosui/AltosConfigFCUI.java b/altosui/AltosConfigFCUI.java
index 1e875dec..2eb6ae75 100644
--- a/altosui/AltosConfigFCUI.java
+++ b/altosui/AltosConfigFCUI.java
@@ -23,8 +23,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
 import java.text.*;
-import org.altusmetrum.altoslib_12.*;
-import org.altusmetrum.altosuilib_12.*;
+import org.altusmetrum.altoslib_14.*;
+import org.altusmetrum.altosuilib_14.*;
 
 public class AltosConfigFCUI
 	extends AltosUIDialog
@@ -46,6 +46,7 @@ public class AltosConfigFCUI
 	JLabel			aprs_interval_label;
 	JLabel			aprs_ssid_label;
 	JLabel			aprs_format_label;
+	JLabel			aprs_offset_label;
 	JLabel			flight_log_max_label;
 	JLabel			ignite_mode_label;
 	JLabel			pad_orientation_label;
@@ -72,6 +73,7 @@ public class AltosConfigFCUI
 	JComboBox<String>	aprs_interval_value;
 	JComboBox<Integer>	aprs_ssid_value;
 	JComboBox<String>	aprs_format_value;
+	JComboBox<Integer>	aprs_offset_value;
 	JComboBox<String>	flight_log_max_value;
 	JComboBox<String>	ignite_mode_value;
 	JComboBox<String>	pad_orientation_value;
@@ -130,6 +132,10 @@ public class AltosConfigFCUI
 		0, 1, 2 ,3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
 	};
 
+	static Integer[]	aprs_offset_values = {
+		0, 2, 4, 6, 8, 10, 12, 14, 16, 18
+	};
+
 	static String[] 	beep_values = {
 		"3750",
 		"4000",
@@ -236,6 +242,15 @@ public class AltosConfigFCUI
 			aprs_format_value.setToolTipText("Hardware doesn't support APRS");
 	}
 
+	void set_aprs_offset_tool_tip() {
+		if (aprs_offset_value.isVisible())
+			aprs_offset_value.setToolTipText("Set the APRS offset from top of minute");
+		else if (aprs_offset_value.isVisible())
+			aprs_offset_value.setToolTipText("Software version doesn't support setting the APRS offset");
+		else
+			aprs_offset_value.setToolTipText("Hardware doesn't support APRS");
+	}
+
 	void set_flight_log_max_tool_tip() {
 		if (flight_log_max_value.isVisible())
 			flight_log_max_value.setToolTipText("Size reserved for each flight log (in kB)");
@@ -440,7 +455,7 @@ public class AltosConfigFCUI
 		apogee_lockout_value.setEditable(true);
 		apogee_lockout_value.addItemListener(this);
 		pane.add(apogee_lockout_value, c);
-		apogee_lockout_value.setToolTipText("Time after boost while apogee detection is locked out");
+		apogee_lockout_value.setToolTipText("Time after launch while apogee detection is locked out");
 		row++;
 
 		/* Frequency */
@@ -621,6 +636,33 @@ public class AltosConfigFCUI
 		set_aprs_format_tool_tip();
 		row++;
 
+		/* APRS offset */
+		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_offset_label = new JLabel("APRS offset:");
+		pane.add(aprs_offset_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_offset_value = new JComboBox<Integer>(aprs_offset_values);
+		aprs_offset_value.setEditable(false);
+		aprs_offset_value.addItemListener(this);
+		aprs_offset_value.setMaximumRowCount(aprs_offset_values.length);
+		pane.add(aprs_offset_value, c);
+		set_aprs_offset_tool_tip();
+		row++;
+
 		/* Callsign */
 		c = new GridBagConstraints();
 		c.gridx = 0; c.gridy = row;
@@ -1427,20 +1469,29 @@ public class AltosConfigFCUI
 		return pyro_firing_time;
 	}
 
+	private String aprs_interval_string(int interval) {
+		if (interval == 0)
+			return "Disabled";
+		return Integer.toString(interval);
+	}
+
+	private int aprs_interval_value(String interval) throws AltosConfigDataException {
+		if (interval.equalsIgnoreCase("Disabled"))
+			return 0;
+		return parse_int("aprs interval", interval, false);
+	}
+
 	public void set_aprs_interval(int new_aprs_interval) {
 		if (new_aprs_interval != AltosLib.MISSING)
-			aprs_interval_value.setSelectedItem(Integer.toString(new_aprs_interval));
+			aprs_interval_value.setSelectedItem(aprs_interval_string(new_aprs_interval));
 		aprs_interval_value.setVisible(new_aprs_interval != AltosLib.MISSING);
 		aprs_interval_label.setVisible(new_aprs_interval != AltosLib.MISSING);
 		set_aprs_interval_tool_tip();
 	}
 
 	public int aprs_interval() throws AltosConfigDataException {
-		if (aprs_interval_value.isVisible()) {
-			String	s = aprs_interval_value.getSelectedItem().toString();
-
-			return parse_int("aprs interval", s, false);
-		}
+		if (aprs_interval_value.isVisible())
+			return aprs_interval_value(aprs_interval_value.getSelectedItem().toString());
 		return AltosLib.MISSING;
 	}
 
@@ -1473,4 +1524,20 @@ public class AltosConfigFCUI
 			return aprs_format_value.getSelectedIndex();
 		return AltosLib.MISSING;
 	}
+
+	public void set_aprs_offset(int new_aprs_offset) {
+		if (new_aprs_offset != AltosLib.MISSING)
+			aprs_offset_value.setSelectedItem(new_aprs_offset);
+		aprs_offset_value.setVisible(new_aprs_offset != AltosLib.MISSING);
+		aprs_offset_label.setVisible(new_aprs_offset != AltosLib.MISSING);
+		set_aprs_offset_tool_tip();
+	}
+
+	public int aprs_offset() throws AltosConfigDataException {
+		if (aprs_offset_value.isVisible()) {
+			Integer i = (Integer) aprs_offset_value.getSelectedItem();
+			return i;
+		}
+		return AltosLib.MISSING;
+	}
 }