X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosLink.java;h=62bd82b93c2ae617c4d67a305696e99a32bd3ba7;hp=ee1f9785bb7a111158edceb3cc249afa0f5f3014;hb=e7515e3a88d53c50dd9b962cc8f43ce5376ccd0b;hpb=e26306c9350ef1d107d4257ef1c09d15165c9154

diff --git a/altoslib/AltosLink.java b/altoslib/AltosLink.java
index ee1f9785..62bd82b9 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_2;
+package org.altusmetrum.altoslib_5;
 
 import java.io.*;
 import java.util.concurrent.*;
@@ -76,7 +76,7 @@ public abstract class AltosLink implements Runnable {
 		return get_reply(5000);
 	}
 
-		
+
 	public abstract boolean can_cancel_reply();
 	public abstract boolean show_reply_timeout();
 	public abstract void hide_reply_timeout();
@@ -163,8 +163,21 @@ public abstract class AltosLink implements Runnable {
 		if (!can_cancel && remote)
 			System.out.printf("Uh-oh, reading remote serial device from swing thread\n");
 
-		if (remote && can_cancel)
+		if (remote && can_cancel) {
 			timeout = 500;
+			switch (telemetry_rate) {
+			case AltosLib.ao_telemetry_rate_38400:
+			default:
+				timeout = 500;
+				break;
+			case AltosLib.ao_telemetry_rate_9600:
+				timeout = 2000;
+				break;
+			case AltosLib.ao_telemetry_rate_2400:
+				timeout = 8000;
+				break;
+			}
+		}
 		try {
 			++in_reply;
 
@@ -215,7 +228,7 @@ public abstract class AltosLink implements Runnable {
 					break;
 				}
 			}
-			
+
 		} finally {
 			--in_reply;
 		}
@@ -251,13 +264,7 @@ public abstract class AltosLink implements Runnable {
 
 	public void add_bytes(byte[] bytes, int len) throws InterruptedException {
 		String	line;
-		try {
-			line = new String(bytes, 0, len, "UTF-8");
-		} catch (UnsupportedEncodingException ue) {
-			line = "";
-			for (int i = 0; i < len; i++)
-				line = line + bytes[i];
-		}
+		line = new String(bytes, 0, len, AltosLib.unicode_set);
 		if (debug)
 			System.out.printf("\t\t\t\t\t%s\n", line);
 		add_string(line);
@@ -280,6 +287,8 @@ public abstract class AltosLink implements Runnable {
 	}
 
 	public void flush_output() {
+		if (pending_output == null)
+			return;
 		for (String s : pending_output)
 			System.out.print(s);
 		pending_output.clear();
@@ -311,6 +320,7 @@ public abstract class AltosLink implements Runnable {
 	 */
 	public boolean monitor_mode = false;
 	public int telemetry = AltosLib.ao_telemetry_standard;
+	public int telemetry_rate = -1;
 	public double frequency;
 	public String callsign;
 	AltosConfigData	config_data;
@@ -362,6 +372,15 @@ public abstract class AltosLink implements Runnable {
 		flush_output();
 	}
 
+	public void set_telemetry_rate(int in_telemetry_rate) {
+		telemetry_rate = in_telemetry_rate;
+		if (monitor_mode)
+			printf("m 0\nc T %d\nm %x\n", telemetry_rate, telemetry_len());
+		else
+			printf("c T %d\n", telemetry_rate);
+		flush_output();
+	}
+
 	public void set_monitor(boolean monitor) {
 		monitor_mode = monitor;
 		if (monitor)
@@ -389,10 +408,14 @@ public abstract class AltosLink implements Runnable {
 		flush_output();
 	}
 
-	public AltosConfigData config_data() throws InterruptedException, TimeoutException {
+ 	public AltosConfigData config_data() throws InterruptedException, TimeoutException {
 		synchronized(config_data_lock) {
-			if (config_data == null)
+			if (config_data == null) {
+				printf("m 0\n");
 				config_data = new AltosConfigData(this);
+				if (monitor_mode)
+					set_monitor(true);
+			}
 			return config_data;
 		}
 	}
@@ -436,7 +459,12 @@ public abstract class AltosLink implements Runnable {
 		if (debug)
 			System.out.printf("start remote %7.3f\n", frequency);
 		set_radio_frequency(frequency);
-		set_callsign(AltosPreferences.callsign());
+		if (telemetry_rate < 0)
+			telemetry_rate = AltosPreferences.telemetry_rate(serial);
+		set_telemetry_rate(telemetry_rate);
+		if (callsign.equals(""))
+			callsign = AltosPreferences.callsign();
+		set_callsign(callsign);
 		printf("p\nE 0\n");
 		flush_input();
 		remote = true;