X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=telegps%2FTeleGPSConfigUI.java;h=5e700b72c2bebaa68264458f97506bf8c3383fca;hp=ee2fbd2dfea39a43afa6b771fb4aac9aab14ebd1;hb=4231d68bae69d9a7d1f52205002db452cd5f986d;hpb=424112349d54bb6360403683f8012b83f49220be

diff --git a/telegps/TeleGPSConfigUI.java b/telegps/TeleGPSConfigUI.java
index ee2fbd2d..5e700b72 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
@@ -37,6 +37,7 @@ public class TeleGPSConfigUI
 	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;
@@ -50,9 +51,10 @@ 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;
+	AltosUIRateList		rate_value;
 	JComboBox<String>	aprs_interval_value;
 	JComboBox<Integer>	aprs_ssid_value;
 	JComboBox<String>	flight_log_max_value;
@@ -147,6 +149,13 @@ public class TeleGPSConfigUI
 			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");
@@ -270,13 +279,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++;
 
@@ -330,6 +335,31 @@ public class TeleGPSConfigUI
 		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(rate_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;
@@ -640,6 +670,9 @@ public class TeleGPSConfigUI
 		serial_value.setText(String.format("%d", serial));
 	}
 
+	public void set_altitude_32(int altitude_32) {
+	}
+
 	public void set_main_deploy(int new_main_deploy) {
 	}
 
@@ -707,6 +740,14 @@ public class TeleGPSConfigUI
 			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);