X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosLink.java;h=4823a986011c1ec80f443bfc16c6cc0e24458ce3;hp=d59e73ba6eca2a690da98f0d46e9db7e6c870919;hb=cdb32b1717db4e8cb8cf94d810e74ce2b569566b;hpb=52196975c447851f14619213c1de5101d334eebc

diff --git a/altoslib/AltosLink.java b/altoslib/AltosLink.java
index d59e73ba..4823a986 100644
--- a/altoslib/AltosLink.java
+++ b/altoslib/AltosLink.java
@@ -15,15 +15,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_2;
 
-import java.lang.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
-import java.text.*;
 
-public abstract class AltosLink {
+public abstract class AltosLink implements Runnable {
 
 	public final static int ERROR = -1;
 	public final static int TIMEOUT = -2;
@@ -34,17 +32,20 @@ public abstract class AltosLink {
 
 	public static boolean debug = false;
 	public static void set_debug(boolean in_debug) { debug = in_debug; }
+
+	public boolean has_error;
+
 	LinkedList<String> pending_output = new LinkedList<String>();
 
 	public LinkedList<LinkedBlockingQueue<AltosLine>> monitors = new LinkedList<LinkedBlockingQueue<AltosLine>> ();;
 	public LinkedBlockingQueue<AltosLine> reply_queue = new LinkedBlockingQueue<AltosLine>();
 
-	public void add_monitor(LinkedBlockingQueue<AltosLine> q) {
+	public synchronized void add_monitor(LinkedBlockingQueue<AltosLine> q) {
 		set_monitor(true);
 		monitors.add(q);
 	}
 
-	public void remove_monitor(LinkedBlockingQueue<AltosLine> q) {
+	public synchronized void remove_monitor(LinkedBlockingQueue<AltosLine> q) {
 		monitors.remove(q);
 		if (monitors.isEmpty())
 			set_monitor(false);
@@ -101,15 +102,24 @@ public abstract class AltosLink {
 		try {
 			for (;;) {
 				c = getchar();
-				if (Thread.interrupted())
+				if (Thread.interrupted()) {
+					if (debug)
+						System.out.printf("INTERRUPTED\n");
 					break;
+				}
 				if (c == ERROR) {
+					if (debug)
+						System.out.printf("ERROR\n");
+					has_error = true;
 					add_telem (new AltosLine());
 					add_reply (new AltosLine());
 					break;
 				}
-				if (c == TIMEOUT)
+				if (c == TIMEOUT) {
+					if (debug)
+						System.out.printf("TIMEOUT\n");
 					continue;
+				}
 				if (c == '\r')
 					continue;
 				synchronized(this) {
@@ -180,6 +190,14 @@ public abstract class AltosLink {
 		reply_queue.put (line);
 	}
 
+	public void abort_reply() {
+		try {
+			add_telem (new AltosLine());
+			add_reply (new AltosLine());
+		} catch (InterruptedException e) {
+		}
+	}
+
 	public void add_string(String line) throws InterruptedException {
 		if (line.startsWith("TELEM") || line.startsWith("VERSION") || line.startsWith("CRC")) {
 			add_telem(new AltosLine(line));
@@ -235,8 +253,11 @@ public abstract class AltosLink {
 	public boolean monitor_mode = false;
 	public int telemetry = AltosLib.ao_telemetry_standard;
 	public double frequency;
+	public String callsign;
 	AltosConfigData	config_data;
 
+	private Object config_data_lock = new Object();
+
 	private int telemetry_len() {
 		return AltosLib.telemetry_len(telemetry);
 	}
@@ -270,8 +291,8 @@ public abstract class AltosLink {
 		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);
 	}
 
@@ -310,12 +331,15 @@ public abstract class AltosLink {
 	}
 
 	public AltosConfigData config_data() throws InterruptedException, TimeoutException {
-		if (config_data == null)
-			config_data = new AltosConfigData(this);
-		return config_data;
+		synchronized(config_data_lock) {
+			if (config_data == null)
+				config_data = new AltosConfigData(this);
+			return config_data;
+		}
 	}
 
 	public void set_callsign(String callsign) {
+		this.callsign = callsign;
 		printf ("c c %s\n", callsign);
 		flush_output();
 	}
@@ -325,10 +349,10 @@ public abstract class AltosLink {
 	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 (debug)
+			System.out.printf("start remote %7.3f\n", frequency);
 		set_radio_frequency(frequency);
 		set_callsign(AltosPreferences.callsign());
 		printf("p\nE 0\n");
@@ -348,6 +372,65 @@ public abstract class AltosLink {
 		remote = false;
 	}
 
+	public int rssi() throws TimeoutException, InterruptedException {
+		if (remote)
+			return 0;
+		printf("s\n");
+		String line = get_reply_no_dialog(5000);
+		if (line == null)
+			throw new TimeoutException();
+		String[] items = line.split("\\s+");
+		if (items.length < 2)
+			return 0;
+		if (!items[0].equals("RSSI:"))
+			return 0;
+		int rssi = Integer.parseInt(items[1]);
+		return rssi;
+	}
+
+	public String[] adc() throws TimeoutException, InterruptedException {
+		printf("a\n");
+		for (;;) {
+			String line = get_reply_no_dialog(5000);
+			if (line == null) {
+				throw new TimeoutException();
+			}
+			if (!line.startsWith("tick:"))
+				continue;
+			String[] items = line.split("\\s+");
+			return items;
+		}
+	}
+
+	public boolean has_monitor_battery() {
+		return config_data.has_monitor_battery();
+	}
+
+	public double monitor_battery() {
+		int monitor_batt = AltosLib.MISSING;
+
+		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;
+				}
+				i++;
+			}
+			} catch (InterruptedException ie) {
+			} catch (TimeoutException te) {
+			}
+		}
+		if (monitor_batt == AltosLib.MISSING)
+			return AltosLib.MISSING;
+		return AltosConvert.cc_battery_to_voltage(monitor_batt);
+	}
+
 	public AltosLink() {
+		callsign = "";
+		has_error = false;
 	}
 }