X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=telegps%2FTeleGPSConfigUI.java;h=7c5d186e9864728f5b959b69e594e21c69314768;hb=e142c4bd6f2fbab74fb7b7cea7e9a19234ed0123;hp=a68c82cb1145cc17ee67927b94b0f984dd188e8e;hpb=171adbe7db8520f5ff52a5fe2c54fe165c6f91f8;p=fw%2Faltos

diff --git a/telegps/TeleGPSConfigUI.java b/telegps/TeleGPSConfigUI.java
index a68c82cb..7c5d186e 100644
--- a/telegps/TeleGPSConfigUI.java
+++ b/telegps/TeleGPSConfigUI.java
@@ -23,8 +23,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.altoslib_11.*;
-import org.altusmetrum.altosuilib_11.*;
+import org.altusmetrum.altoslib_14.*;
+import org.altusmetrum.altosuilib_14.*;
 
 public class TeleGPSConfigUI
 	extends AltosUIDialog
@@ -43,6 +43,7 @@ public class TeleGPSConfigUI
 	JLabel			aprs_interval_label;
 	JLabel			aprs_ssid_label;
 	JLabel			aprs_format_label;
+	JLabel			aprs_offset_label;
 	JLabel			flight_log_max_label;
 	JLabel			callsign_label;
 	JLabel			tracker_motion_label;
@@ -61,6 +62,7 @@ public class TeleGPSConfigUI
 	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;
 	JTextField		callsign_value;
 	JComboBox<String>	tracker_motion_value;
@@ -84,6 +86,10 @@ public class TeleGPSConfigUI
 		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[]		tracker_motion_values_m = {
 		"2",
 		"5",
@@ -178,6 +184,15 @@ public class TeleGPSConfigUI
 			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)");
@@ -444,6 +459,33 @@ public class TeleGPSConfigUI
 		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;
@@ -619,7 +661,7 @@ public class TeleGPSConfigUI
 		return true;
 	}
 
-	void set_dirty() {
+	public void set_dirty() {
 		dirty = true;
 		save.setEnabled(true);
 	}
@@ -634,6 +676,17 @@ public class TeleGPSConfigUI
 		super.dispose();
 	}
 
+	public int accel_cal_plus() {
+		return AltosLib.MISSING;
+	}
+
+	public int accel_cal_minus() {
+		return AltosLib.MISSING;
+	}
+
+	public void set_accel_cal(int accel_plus, int accel_minus) {
+	}
+
 	/* Listen for events from our buttons */
 	public void actionPerformed(ActionEvent e) {
 		String	cmd = e.getActionCommand();
@@ -821,14 +874,18 @@ public class TeleGPSConfigUI
 		return parse_int("flight log max", flight_log_max_value.getSelectedItem().toString(), true);
 	}
 
-	public void set_flight_log_max_limit(int new_flight_log_max_limit) {
+	public void set_flight_log_max_limit(int new_flight_log_max_limit, int new_storage_erase_unit) {
 		flight_log_max_limit = new_flight_log_max_limit;
-		flight_log_max_value.removeAllItems();
-		for (int i = 8; i >= 1; i--) {
-			int	size = flight_log_max_limit / i;
-			flight_log_max_value.addItem(String.format("%d (%d flights)", size, i));
+		if (new_flight_log_max_limit != AltosLib.MISSING) {
+			flight_log_max_value.removeAllItems();
+			for (int i = 8; i >= 1; i--) {
+				int	size = flight_log_max_limit / i;
+				if (new_storage_erase_unit != 0)
+					size &= ~(new_storage_erase_unit - 1);
+				flight_log_max_value.addItem(String.format("%d (%d flights)", size, i));
+			}
 		}
-		if (flight_log_max != 0)
+		if (flight_log_max != 0 && flight_log_max != AltosLib.MISSING)
 			set_flight_log_max(flight_log_max);
 	}
 
@@ -952,4 +1009,19 @@ public class TeleGPSConfigUI
 			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;
+	}
 }