X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosMag.java;h=690241f13e53c98ed97da0a8a76a0ef2c51aaaf6;hp=0f8399ab02b28976f1798b52a77cc74d40d85590;hb=c8078d352a7f54a4a97d25af080155d3f875536a;hpb=f86dac643081987c8994ab57a96640d5e91b342a

diff --git a/altoslib/AltosMag.java b/altoslib/AltosMag.java
index 0f8399ab..690241f1 100644
--- a/altoslib/AltosMag.java
+++ b/altoslib/AltosMag.java
@@ -15,11 +15,75 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_5;
 
-public class AltosMag {
-	public int		x;
-	public int		y;
-	public int		z;
+import java.util.concurrent.*;
+
+public class AltosMag implements Cloneable {
+	public double		x;
+	public double		y;
+	public double		z;
+
+	public static double counts_per_gauss = 1090;
+
+	public static double convert_gauss(int counts) {
+		return (double) counts / counts_per_gauss;
+	}
+
+	public boolean parse_string(String line) {
+//		if (line.startsWith("Syntax error")) {
+//			x = y = z = 0;
+//			return true;
+//		}
+
+		if (!line.startsWith("X:"))
+			return false;
+
+		String[] items = line.split("\\s+");
+
+		if (items.length >= 6) {
+			x = convert_gauss(Integer.parseInt(items[1]));
+			y = convert_gauss(Integer.parseInt(items[3]));
+			z = convert_gauss(Integer.parseInt(items[5]));
+		}
+		return true;
+	}
+
+	public AltosMag clone() {
+		AltosMag n = new AltosMag();
+
+		n.x = x;
+		n.y = y;
+		n.z = z;
+		return n;
+	}
+
+	public AltosMag() {
+		x = AltosLib.MISSING;
+		y = AltosLib.MISSING;
+		z = AltosLib.MISSING;
+	}
+
+	static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException {
+		try {
+			AltosMag	mag = new AltosMag(link);
+
+			if (mag != null)
+				state.set_mag(mag);
+		} catch (TimeoutException te) {
+		}
+	}
+
+	public AltosMag(AltosLink link) throws InterruptedException, TimeoutException {
+		this();
+		link.printf("M\n");
+		for (;;) {
+			String line = link.get_reply_no_dialog(5000);
+			if (line == null) {
+				throw new TimeoutException();
+			}
+			if (parse_string(line))
+				break;
+		}
+	}
 }
-	
\ No newline at end of file