projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/stm: Add more bits to NVIC register definitions
[fw/altos]
/
altoslib
/
AltosLink.java
diff --git
a/altoslib/AltosLink.java
b/altoslib/AltosLink.java
index 6d510563c5d32622bfbc3cfb854da885c21b4f27..9eb25ce0ac47b53092e706606e88be0104d15f20 100644
(file)
--- a/
altoslib/AltosLink.java
+++ b/
altoslib/AltosLink.java
@@
-15,7
+15,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.
AltosLib
;
+package org.altusmetrum.
altoslib_1
;
import java.io.*;
import java.util.concurrent.*;
import java.io.*;
import java.util.concurrent.*;
@@
-249,6
+249,7
@@
public abstract class AltosLink implements Runnable {
public boolean monitor_mode = false;
public int telemetry = AltosLib.ao_telemetry_standard;
public double frequency;
public boolean monitor_mode = false;
public int telemetry = AltosLib.ao_telemetry_standard;
public double frequency;
+ public String callsign;
AltosConfigData config_data;
private int telemetry_len() {
AltosConfigData config_data;
private int telemetry_len() {
@@
-284,8
+285,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);
}
@@
-330,6
+331,7
@@
public abstract class AltosLink implements Runnable {
}
public void set_callsign(String callsign) {
}
public void set_callsign(String callsign) {
+ this.callsign = callsign;
printf ("c c %s\n", callsign);
flush_output();
}
printf ("c c %s\n", callsign);
flush_output();
}
@@
-339,10
+341,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");
@@
-363,5
+365,6
@@
public abstract class AltosLink implements Runnable {
}
public AltosLink() {
}
public AltosLink() {
+ callsign = "";
}
}
}
}