X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=telegps%2FTeleGPSConfigUI.java;h=dd3965b48960597ac70ca5525fc47abf9dfbb7d7;hp=4e6575868ab33a609cc897b5f8c9c8402f1165f4;hb=238e56e0f6ab2f623e0faf25298b38dc3a4aff74;hpb=3e5e9333420ede74d998556c1bbd5888e8ff75ae

diff --git a/telegps/TeleGPSConfigUI.java b/telegps/TeleGPSConfigUI.java
index 4e657586..dd3965b4 100644
--- a/telegps/TeleGPSConfigUI.java
+++ b/telegps/TeleGPSConfigUI.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,8 +23,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.altoslib_6.*;
-import org.altusmetrum.altosuilib_6.*;
+import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altosuilib_11.*;
 
 public class TeleGPSConfigUI
 	extends AltosUIDialog
@@ -54,7 +55,7 @@ public class TeleGPSConfigUI
 	JLabel			version_value;
 	JLabel			serial_value;
 	AltosUIFreqList		radio_frequency_value;
-	JTextField		radio_calibration_value;
+	JLabel			radio_calibration_value;
 	JRadioButton		radio_enable_value;
 	AltosUIRateList		rate_value;
 	JComboBox<String>	aprs_interval_value;
@@ -138,13 +139,6 @@ public class TeleGPSConfigUI
 		return product != null && product.startsWith("TeleGPS");
 	}
 
-	void set_radio_calibration_tool_tip() {
-		if (radio_calibration_value.isEnabled())
-			radio_calibration_value.setToolTipText("Tune radio output to match desired frequency");
-		else
-			radio_calibration_value.setToolTipText("Cannot tune radio while connected over packet mode");
-	}
-
 	void set_radio_enable_tool_tip() {
 		if (radio_enable_value.isEnabled())
 			radio_enable_value.setToolTipText("Enable/Disable telemetry and RDF transmissions");
@@ -316,10 +310,8 @@ public class TeleGPSConfigUI
 		c.anchor = GridBagConstraints.LINE_START;
 		c.insets = ir;
 		c.ipady = 5;
-		radio_calibration_value = new JTextField(String.format("%d", 1186611));
-		radio_calibration_value.getDocument().addDocumentListener(this);
+		radio_calibration_value = new JLabel(String.format("%d", 1186611));
 		pane.add(radio_calibration_value, c);
-		set_radio_calibration_tool_tip();
 		row++;
 
 		/* Radio Enable */
@@ -760,10 +752,6 @@ public class TeleGPSConfigUI
 		}
 	}
 
-	public int radio_calibration() throws AltosConfigDataException {
-		return parse_int("radio calibration", radio_calibration_value.getText(), false);
-	}
-
 	public void set_radio_enable(int new_radio_enable) {
 		if (new_radio_enable >= 0) {
 			radio_enable_value.setSelected(new_radio_enable > 0);
@@ -867,7 +855,7 @@ public class TeleGPSConfigUI
 	}
 
 	String get_tracker_motion_label() {
-		return String.format("Logging Trigger Motion (%s):", AltosConvert.height.show_units());
+		return String.format("Logging Trigger Motion (%s):", AltosConvert.height.parse_units());
 	}
 
 	void set_tracker_tool_tip() {