From: Keith Packard <keithp@keithp.com>
Date: Tue, 22 Mar 2016 04:28:39 +0000 (-0600)
Subject: altosui,telegps: Do not allow radio calibration to be edited
X-Git-Tag: 1.6.3~2^2~73
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=55db3b3e8addaa2dc0af50470d3bc8c25cb57df3

altosui,telegps: Do not allow radio calibration to be edited

This leads to sorrow for almost everyone. If you want to edit this,
use a terminal program.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index 7a518ab4..b6475bb3 100644
--- a/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.java
@@ -493,8 +493,6 @@ public class AltosConfigData implements Iterable<String> {
 			radio_enable = source.radio_enable();
 		if (callsign != null)
 			callsign = source.callsign();
-		if (radio_calibration >= 0)
-			radio_calibration = source.radio_calibration();
 		if (telemetry_rate >= 0)
 			telemetry_rate = source.telemetry_rate();
 
@@ -601,10 +599,6 @@ public class AltosConfigData implements Iterable<String> {
 		if (apogee_lockout >= 0)
 			link.printf("c L %d\n", apogee_lockout);
 
-		/* Don't mess with radio calibration when remote */
-		if (radio_calibration > 0 && !remote)
-			link.printf("c f %d\n", radio_calibration);
-
 		/* HAS_RADIO */
 		if (has_frequency()) {
 			boolean has_frequency = radio_frequency >= 0;
diff --git a/altoslib/AltosConfigValues.java b/altoslib/AltosConfigValues.java
index 3306aa4b..931d173c 100644
--- a/altoslib/AltosConfigValues.java
+++ b/altoslib/AltosConfigValues.java
@@ -45,8 +45,6 @@ public interface AltosConfigValues {
 
 	public abstract void set_radio_calibration(int new_radio_calibration);
 
-	public abstract int radio_calibration() throws AltosConfigDataException;
-
 	public abstract void set_radio_enable(int new_radio_enable);
 
 	public abstract int radio_enable();
diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java
index a4216212..99f4593b 100644
--- a/altosui/AltosConfigUI.java
+++ b/altosui/AltosConfigUI.java
@@ -63,7 +63,7 @@ public class AltosConfigUI
 	JComboBox<String>	apogee_delay_value;
 	JComboBox<String>	apogee_lockout_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;
@@ -191,13 +191,6 @@ public class AltosConfigUI
 		return product != null && product.startsWith("TeleMetrum");
 	}
 
-	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");
@@ -478,12 +471,8 @@ public class AltosConfigUI
 		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);
-		if (remote)
-			radio_calibration_value.setEnabled(false);
+		radio_calibration_value = new JLabel(String.format("%d", 1186611));
 		pane.add(radio_calibration_value, c);
-		set_radio_calibration_tool_tip();
 		row++;
 
 		/* Radio Enable */
@@ -1087,10 +1076,6 @@ public class AltosConfigUI
 			radio_calibration_value.setText(String.format("%d", new_radio_calibration));
 	}
 
-	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) {
 		radio_enable_label.setVisible(new_radio_enable >= 0);
 		radio_enable_value.setVisible(new_radio_enable >= 0);
diff --git a/telegps/TeleGPSConfigUI.java b/telegps/TeleGPSConfigUI.java
index 5a3a05eb..7a5a4dfd 100644
--- a/telegps/TeleGPSConfigUI.java
+++ b/telegps/TeleGPSConfigUI.java
@@ -54,7 +54,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 +138,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 +309,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 +751,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);