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

diff --git a/altoslib/AltosMag.java b/altoslib/AltosMag.java
index 56add8f3..690241f1 100644
--- a/altoslib/AltosMag.java
+++ b/altoslib/AltosMag.java
@@ -15,25 +15,36 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_5;
 
 import java.util.concurrent.*;
 
 public class AltosMag implements Cloneable {
-	public int		x;
-	public int		y;
-	public int		z;
+	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 = Integer.parseInt(items[1]);
-			y = Integer.parseInt(items[3]);
-			z = Integer.parseInt(items[5]);
+			x = convert_gauss(Integer.parseInt(items[1]));
+			y = convert_gauss(Integer.parseInt(items[3]));
+			z = convert_gauss(Integer.parseInt(items[5]));
 		}
 		return true;
 	}
@@ -53,14 +64,13 @@ public class AltosMag implements Cloneable {
 		z = AltosLib.MISSING;
 	}
 
-	static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) {
+	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) {
-		} catch (InterruptedException ie) {
 		}
 	}
 
@@ -77,4 +87,3 @@ public class AltosMag implements Cloneable {
 		}
 	}
 }
-	
\ No newline at end of file