X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=telegps%2FTeleGPSConfigUI.java;h=97ab34b40b0b1846d1a93f8ef4b9e958869199e1;hp=7a59bf48a6c8e05571de73286cdc0dc96eba3299;hb=d446c90dab0aca7e501a0228f24c210758d84a1d;hpb=fa155693282746861b227afd6cbccc83dfd1bbed

diff --git a/telegps/TeleGPSConfigUI.java b/telegps/TeleGPSConfigUI.java
index 7a59bf48..97ab34b4 100644
--- a/telegps/TeleGPSConfigUI.java
+++ b/telegps/TeleGPSConfigUI.java
@@ -21,8 +21,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.altoslib_5.*;
-import org.altusmetrum.altosuilib_3.*;
+import org.altusmetrum.altoslib_6.*;
+import org.altusmetrum.altosuilib_6.*;
 
 public class TeleGPSConfigUI
 	extends AltosUIDialog
@@ -40,6 +40,7 @@ public class TeleGPSConfigUI
 	JLabel			rate_label;
 	JLabel			aprs_interval_label;
 	JLabel			aprs_ssid_label;
+	JLabel			aprs_format_label;
 	JLabel			flight_log_max_label;
 	JLabel			callsign_label;
 	JLabel			tracker_motion_label;
@@ -57,6 +58,7 @@ public class TeleGPSConfigUI
 	AltosUIRateList		rate_value;
 	JComboBox<String>	aprs_interval_value;
 	JComboBox<Integer>	aprs_ssid_value;
+	JComboBox<String>	aprs_format_value;
 	JComboBox<String>	flight_log_max_value;
 	JTextField		callsign_value;
 	JComboBox<String>	tracker_motion_value;
@@ -165,11 +167,20 @@ public class TeleGPSConfigUI
 
 	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");
+			aprs_ssid_value.setToolTipText("Set the APRS SSID (secondary station identifier)");
+		else if (aprs_ssid_value.isEnabled())
+			aprs_ssid_value.setToolTipText("Software version doesn't support setting the APRS SSID");
 		else
-			aprs_interval_value.setToolTipText("Hardware doesn't support APRS");
+			aprs_ssid_value.setToolTipText("Hardware doesn't support APRS");
+	}
+
+	void set_aprs_format_tool_tip() {
+		if (aprs_format_value.isEnabled())
+			aprs_format_value.setToolTipText("Set the APRS format (compressed/uncompressed)");
+		else if (aprs_format_value.isEnabled())
+			aprs_format_value.setToolTipText("Software version doesn't support setting the APRS format");
+		else
+			aprs_format_value.setToolTipText("Hardware doesn't support APRS");
 	}
 
 	void set_flight_log_max_tool_tip() {
@@ -344,7 +355,7 @@ public class TeleGPSConfigUI
 		c.insets = il;
 		c.ipady = 5;
 		rate_label = new JLabel("Telemetry baud rate:");
-		pane.add(radio_enable_label, c);
+		pane.add(rate_label, c);
 
 		c = new GridBagConstraints();
 		c.gridx = 4; c.gridy = row;
@@ -413,6 +424,33 @@ public class TeleGPSConfigUI
 		set_aprs_ssid_tool_tip();
 		row++;
 
+		/* APRS format */
+		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_format_label = new JLabel("APRS format:");
+		pane.add(aprs_format_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_format_value = new JComboBox<String>(AltosLib.ao_aprs_format_name);
+		aprs_format_value.setEditable(false);
+		aprs_format_value.addItemListener(this);
+		aprs_format_value.setMaximumRowCount(AltosLib.ao_aprs_format_name.length);
+		pane.add(aprs_format_value, c);
+		set_aprs_format_tool_tip();
+		row++;
+
 		/* Callsign */
 		c = new GridBagConstraints();
 		c.gridx = 0; c.gridy = row;
@@ -894,4 +932,16 @@ public class TeleGPSConfigUI
 		Integer i = (Integer) aprs_ssid_value.getSelectedItem();
 		return i;
 	}
+
+	public void set_aprs_format(int new_aprs_format) {
+		aprs_format_value.setVisible(new_aprs_format >= 0);
+		aprs_format_label.setVisible(new_aprs_format >= 0);
+
+		aprs_format_value.setSelectedIndex(Math.max(0,new_aprs_format));
+		set_aprs_format_tool_tip();
+	}
+
+	public int aprs_format() throws AltosConfigDataException {
+		return aprs_format_value.getSelectedIndex();
+	}
 }