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

diff --git a/altoslib/AltosLink.java b/altoslib/AltosLink.java
index 62bd82b9..5413de9d 100644
--- a/altoslib/AltosLink.java
+++ b/altoslib/AltosLink.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_5;
+package org.altusmetrum.altoslib_12;
 
 import java.io.*;
 import java.util.concurrent.*;
@@ -42,6 +43,8 @@ public abstract class AltosLink implements Runnable {
 	public LinkedBlockingQueue<AltosLine> reply_queue = new LinkedBlockingQueue<AltosLine>();
 	public LinkedBlockingQueue<byte[]> binary_queue = new LinkedBlockingQueue<byte[]>();
 
+	private String match_string = null;
+
 	public synchronized void add_monitor(LinkedBlockingQueue<AltosLine> q) {
 		set_monitor(true);
 		monitors.add(q);
@@ -55,8 +58,11 @@ public abstract class AltosLink implements Runnable {
 
 	public void printf(String format, Object ... arguments) {
 		String	line = String.format(format, arguments);
-		if (debug)
-			pending_output.add(line);
+		if (debug) {
+			synchronized (pending_output) {
+				pending_output.add(line);
+			}
+		}
 		try {
 			print(line);
 		} catch (InterruptedException ie) {
@@ -83,10 +89,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;
@@ -101,6 +114,15 @@ public abstract class AltosLink implements Runnable {
 
 	private int	len_read = 0;
 
+	private boolean match_bytes(byte[] bytes, int byte_count, String match) {
+		if (byte_count < match.length())
+			return false;
+		String	line = new String(bytes, 0, byte_count, AltosLib.unicode_set);
+		if (line == null)
+			return false;
+		return line.indexOf(match) >= 0;
+	}
+
 	public void run () {
 		int c;
 		byte[] line_bytes = null;
@@ -148,6 +170,11 @@ public abstract class AltosLink implements Runnable {
 							line_count = 0;
 							len_read = 0;
 						}
+						if (match_string != null && match_bytes(line_bytes, line_count, match_string)) {
+							match_string = null;
+							add_bytes(line_bytes, line_count);
+							line_count = 0;
+						}
 					}
 				}
 			}
@@ -155,13 +182,16 @@ public abstract class AltosLink implements Runnable {
 		}
 	}
 
+	public void set_match(String match) {
+		match_string = match;
+	}
 
 	public String get_reply(int timeout) throws InterruptedException {
 		boolean	can_cancel = can_cancel_reply();
 		String	reply = null;
 
-		if (!can_cancel && remote)
-			System.out.printf("Uh-oh, reading remote serial device from swing thread\n");
+//		if (!can_cancel && remote)
+//			System.out.printf("Uh-oh, reading remote serial device from swing thread\n");
 
 		if (remote && can_cancel) {
 			timeout = 500;
@@ -286,12 +316,14 @@ public abstract class AltosLink implements Runnable {
 		binary_queue.put(dup);
 	}
 
-	public void flush_output() {
+	public synchronized void flush_output() {
 		if (pending_output == null)
 			return;
-		for (String s : pending_output)
-			System.out.print(s);
-		pending_output.clear();
+		synchronized (pending_output) {
+			for (String s : pending_output)
+				System.out.print(s);
+			pending_output.clear();
+		}
 	}
 
 	public void flush_input(int timeout) throws InterruptedException {
@@ -349,7 +381,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
@@ -381,7 +413,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());
@@ -390,6 +422,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",
@@ -422,8 +458,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 {
@@ -462,7 +500,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");
@@ -521,21 +559,29 @@ public abstract class AltosLink implements Runnable {
 
 		if (config_data.has_monitor_battery()) {
 			try {
-			String[] items = adc();
-			for (int i = 0; i < items.length;) {
-				if (items[i].equals("batt")) {
-					monitor_batt = Integer.parseInt(items[i+1]);
-					i += 2;
-					continue;
+				String[] items = adc();
+				for (int i = 0; i < items.length;) {
+					if (items[i].equals("batt")) {
+						monitor_batt = Integer.parseInt(items[i+1]);
+						i += 2;
+						continue;
+					}
+					i++;
 				}
-				i++;
-			}
 			} catch (TimeoutException te) {
 			}
 		}
 		if (monitor_batt == AltosLib.MISSING)
 			return AltosLib.MISSING;
-		return AltosConvert.cc_battery_to_voltage(monitor_batt);
+
+		double	volts = AltosLib.MISSING;
+		if (config_data.product.startsWith("TeleBT-v3") || config_data.product.startsWith("TeleBT-v4")) {
+			volts = AltosConvert.tele_bt_3_battery(monitor_batt);
+		} else {
+			volts = AltosConvert.cc_battery_to_voltage(monitor_batt);
+		}
+
+		return volts;
 	}
 
 	public AltosLink() {