projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'aprs' into 'master'
[fw/altos]
/
altoslib
/
AltosLink.java
diff --git
a/altoslib/AltosLink.java
b/altoslib/AltosLink.java
index 415c3c64c466daa80bbe5bd6f233a3aa2e821d8e..1b722026067b5bccfea4521bfdfb317cd3a5755a 100644
(file)
--- a/
altoslib/AltosLink.java
+++ b/
altoslib/AltosLink.java
@@
-17,11
+17,9
@@
package org.altusmetrum.AltosLib;
package org.altusmetrum.AltosLib;
-import java.lang.*;
import java.io.*;
import java.util.concurrent.*;
import java.util.*;
import java.io.*;
import java.util.concurrent.*;
import java.util.*;
-import java.text.*;
public abstract class AltosLink implements Runnable {
public abstract class AltosLink implements Runnable {
@@
-286,8
+284,8
@@
public abstract class AltosLink implements Runnable {
frequency = in_frequency;
config_data();
set_radio_frequency(frequency,
frequency = in_frequency;
config_data();
set_radio_frequency(frequency,
- config_data.radio_frequency
!=
0,
- config_data.radio_setting
!=
0,
+ config_data.radio_frequency
>
0,
+ config_data.radio_setting
>
0,
config_data.radio_calibration);
}
config_data.radio_calibration);
}
@@
-341,10
+339,10
@@
public abstract class AltosLink implements Runnable {
public String name;
public void start_remote() throws TimeoutException, InterruptedException {
public String name;
public void start_remote() throws TimeoutException, InterruptedException {
- if (debug)
- System.out.printf("start remote %7.3f\n", frequency);
if (frequency == 0.0)
frequency = AltosPreferences.frequency(serial);
if (frequency == 0.0)
frequency = AltosPreferences.frequency(serial);
+ if (debug)
+ System.out.printf("start remote %7.3f\n", frequency);
set_radio_frequency(frequency);
set_callsign(AltosPreferences.callsign());
printf("p\nE 0\n");
set_radio_frequency(frequency);
set_callsign(AltosPreferences.callsign());
printf("p\nE 0\n");