altosui: AltosSerial and AltosLink both tried to provide frequency setting

AltosLink owns all of the device configuration, so remove that from
AltosSerial and make sure that AltosLink provides the right function
signatures (wasn't using the new direct frequency setting command).

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

diff --git a/altoslib/AltosLink.java b/altoslib/AltosLink.java
index 77b400fc01bf541779860aed2f74513edde223ae..a39204ac3ba26e8892f6c79658625ca7f036067a 100644 (file)
--- a/altoslib/AltosLink.java
+++ b/altoslib/AltosLink.java
@@ -166,6 +166,15 @@ public abstract class AltosLink {
                        set_channel(AltosConvert.radio_frequency_to_channel(frequency));
        }
 
+       public void set_radio_frequency(double in_frequency) throws InterruptedException, TimeoutException {
+               frequency = in_frequency;
+               config_data();
+               set_radio_frequency(frequency,
+                                   config_data.radio_frequency != 0,
+                                   config_data.radio_setting != 0,
+                                   config_data.radio_calibration);
+       }
+
        public void set_telemetry(int in_telemetry) {
                telemetry = in_telemetry;
                if (monitor_mode)
@@ -200,31 +209,12 @@ public abstract class AltosLink {
                flush_output();
        }
 
-       public void set_radio_frequency(double frequency,
-                                       boolean has_setting,
-                                       int cal) {
-               if (debug)
-                       System.out.printf("set_radio_frequency %7.3f %b %d\n", frequency, has_setting, cal);
-               if (has_setting)
-                       set_radio_setting(AltosConvert.radio_frequency_to_setting(frequency, cal));
-               else
-                       set_channel(AltosConvert.radio_frequency_to_channel(frequency));
-       }
-
        public AltosConfigData config_data() throws InterruptedException, TimeoutException {
                if (config_data == null)
                        config_data = new AltosConfigData(this);
                return config_data;
        }
 
-       public void set_radio_frequency(double in_frequency) throws InterruptedException, TimeoutException {
-               frequency = in_frequency;
-               config_data();
-               set_radio_frequency(frequency,
-                                   config_data.radio_setting != 0,
-                                   config_data.radio_calibration);
-       }
-
        public void set_callsign(String callsign) {
                printf ("c c %s\n", callsign);
                flush_output();

diff --git a/altosui/AltosSerial.java b/altosui/AltosSerial.java
index 5768ba710fb13f4b9ac731de677defbeab4e828a..8b60dd547e3f0f4bc3a3c4d267a5e86df84fbbff 100644 (file)
--- a/altosui/AltosSerial.java
+++ b/altosui/AltosSerial.java
@@ -264,59 +264,6 @@ public class AltosSerial extends AltosLink implements Runnable {
                flush_output();
        }
 
-       private int telemetry_len() {
-               return Altos.telemetry_len(telemetry);
-       }
-
-       private void set_channel(int channel) {
-               if (altos != null) {
-                       if (monitor_mode)
-                               printf("m 0\nc r %d\nm %x\n",
-                                      channel, telemetry_len());
-                       else
-                               printf("c r %d\n", channel);
-                       flush_output();
-               }
-       }
-
-       private void set_radio_setting(int setting) {
-               if (altos != null) {
-                       if (monitor_mode)
-                               printf("m 0\nc R %d\nm %x\n",
-                                      setting, telemetry_len());
-                       else
-                               printf("c R %d\n", setting);
-                       flush_output();
-               }
-       }
-
-       private void set_radio_freq(int frequency) {
-               if (altos != null) {
-                       if (monitor_mode)
-                               printf("m 0\nc F %d\nm %x\n",
-                                      frequency, telemetry_len());
-                       else
-                               printf("c F %d\n", frequency);
-                       flush_output();
-               }
-       }
-
-       public void set_radio_frequency(double frequency,
-                                       boolean has_frequency,
-                                       boolean has_setting,
-                                       int cal) {
-               if (debug)
-                       System.out.printf("set_radio_frequency %7.3f (freq %b) (set %b) %d\n", frequency, has_frequency, has_setting, cal);
-               if (frequency == 0)
-                       return;
-               if (has_frequency)
-                       set_radio_freq((int) Math.floor (frequency * 1000));
-               else if (has_setting)
-                       set_radio_setting(AltosConvert.radio_frequency_to_setting(frequency, cal));
-               else
-                       set_channel(AltosConvert.radio_frequency_to_channel(frequency));
-       }
-
        public void set_frame(Frame in_frame) {
                frame = in_frame;
        }