X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosLink.java;h=4f3a1ed24a1d3db89b4393a5771d8b8c050c6857;hb=469be0a57dc9932c26f9c38986d22f6e8b2fd6ed;hp=c0031cadbf059ce3ea38c6e102901dac1be79e9d;hpb=88df7cd314269fa1debe226b49b7e4e9dc238d8e;p=fw%2Faltos

diff --git a/altoslib/AltosLink.java b/altoslib/AltosLink.java
index c0031cad..4f3a1ed2 100644
--- a/altoslib/AltosLink.java
+++ b/altoslib/AltosLink.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_5;
+package org.altusmetrum.altoslib_7;
 
 import java.io.*;
 import java.util.concurrent.*;
@@ -86,10 +86,17 @@ public abstract class AltosLink implements Runnable {
 
 	public boolean	reply_abort;
 	public int	in_reply;
+	boolean	cancel_enable = true;
+
+	public void set_cancel_enable(boolean e) {
+		cancel_enable = e;
+	}
 
 	boolean		reply_timeout_shown = false;
 
 	private boolean check_reply_timeout() {
+		if (!cancel_enable)
+			return false;
 		if (!reply_timeout_shown)
 			reply_timeout_shown = show_reply_timeout();
 		return reply_abort;
@@ -354,7 +361,7 @@ public abstract class AltosLink implements Runnable {
 		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
@@ -386,7 +393,7 @@ public abstract class AltosLink implements Runnable {
 		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());
@@ -395,6 +402,10 @@ public abstract class AltosLink implements Runnable {
 		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",
@@ -427,8 +438,10 @@ public abstract class AltosLink implements Runnable {
 
 	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 {
@@ -467,7 +480,7 @@ public abstract class AltosLink implements Runnable {
 		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");