summaryrefslogtreecommitdiff
path: root/altosui/AltosSerial.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-06-26 22:19:01 -0700
committerKeith Packard <keithp@keithp.com>2012-06-26 22:19:01 -0700
commit9dcb4e2ab60ecf0cc7371c1b1a620be952fa8776 (patch)
tree8b8f78203c88692c4e60dd63820c2ebaa1898cae /altosui/AltosSerial.java
parenteab18714ed9eabbcef0ff81b07427da042a58ccc (diff)
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>
Diffstat (limited to 'altosui/AltosSerial.java')
-rw-r--r--altosui/AltosSerial.java53
1 files changed, 0 insertions, 53 deletions
diff --git a/altosui/AltosSerial.java b/altosui/AltosSerial.java
index 5768ba71..8b60dd54 100644
--- 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;
}