projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add makefile for chaoskey flash loader
[fw/altos]
/
altoslib
/
AltosLink.java
diff --git
a/altoslib/AltosLink.java
b/altoslib/AltosLink.java
index c0031cadbf059ce3ea38c6e102901dac1be79e9d..0105398dbf8c718f6dca40b1a11087305ee42d01 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_
5
;
+package org.altusmetrum.altoslib_
6
;
import java.io.*;
import java.util.concurrent.*;
import java.io.*;
import java.util.concurrent.*;
@@
-354,7
+354,7
@@
public abstract class AltosLink implements Runnable {
if (frequency == 0)
return;
if (has_frequency)
if (frequency == 0)
return;
if (has_frequency)
- set_radio_freq((int) Math.floor (frequency * 1000));
+ set_radio_freq((int) Math.floor (frequency * 1000
+ 0.5
));
else if (has_setting)
set_radio_setting(AltosConvert.radio_frequency_to_setting(frequency, cal));
else
else if (has_setting)
set_radio_setting(AltosConvert.radio_frequency_to_setting(frequency, cal));
else
@@
-386,7
+386,7
@@
public abstract class AltosLink implements Runnable {
flush_output();
}
flush_output();
}
- public void set_monitor(boolean monitor) {
+ public
synchronized
void set_monitor(boolean monitor) {
monitor_mode = monitor;
if (monitor)
printf("m %x\n", telemetry_len());
monitor_mode = monitor;
if (monitor)
printf("m %x\n", telemetry_len());
@@
-395,6
+395,10
@@
public abstract class AltosLink implements Runnable {
flush_output();
}
flush_output();
}
+ public synchronized boolean get_monitor() {
+ return monitor_mode;
+ }
+
private void set_channel(int channel) {
if (monitor_mode)
printf("m 0\nc r %d\nm %x\n",
private void set_channel(int channel) {
if (monitor_mode)
printf("m 0\nc r %d\nm %x\n",
@@
-427,8
+431,10
@@
public abstract class AltosLink implements Runnable {
public void set_callsign(String callsign) {
this.callsign = callsign;
public void set_callsign(String callsign) {
this.callsign = callsign;
- printf ("c c %s\n", callsign);
- flush_output();
+ if (callsign != null) {
+ printf ("c c %s\n", callsign);
+ flush_output();
+ }
}
public boolean is_loader() throws InterruptedException {
}
public boolean is_loader() throws InterruptedException {
@@
-467,7
+473,7
@@
public abstract class AltosLink implements Runnable {
if (telemetry_rate < 0)
telemetry_rate = AltosPreferences.telemetry_rate(serial);
set_telemetry_rate(telemetry_rate);
if (telemetry_rate < 0)
telemetry_rate = AltosPreferences.telemetry_rate(serial);
set_telemetry_rate(telemetry_rate);
- if (callsign.equals(""))
+ if (callsign
== null || callsign
.equals(""))
callsign = AltosPreferences.callsign();
set_callsign(callsign);
printf("p\nE 0\n");
callsign = AltosPreferences.callsign();
set_callsign(callsign);
printf("p\nE 0\n");