altosui: AltosSerial and AltosLink both tried to provide frequency setting

[fw/altos] / altosui / AltosSerial.java

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;
        }