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

diff --git a/altoslib/AltosMag.java b/altoslib/AltosMag.java
index 690241f1..ab5d3f57 100644
--- a/altoslib/AltosMag.java
+++ b/altoslib/AltosMag.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,26 +16,23 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_5;
+package org.altusmetrum.altoslib_14;
 
 import java.util.concurrent.*;
+import java.io.*;
 
 public class AltosMag implements Cloneable {
-	public double		x;
-	public double		y;
-	public double		z;
+	public int		x;
+	public int		z;
+	public int		y;
 
-	public static double counts_per_gauss = 1090;
+	public static final double counts_per_gauss = 1090;
 
-	public static double convert_gauss(int counts) {
-		return (double) counts / counts_per_gauss;
+	public static double convert_gauss(double counts) {
+		return 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;
@@ -42,9 +40,9 @@ public class AltosMag implements Cloneable {
 		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]));
+			x = Integer.parseInt(items[1]);
+			z = Integer.parseInt(items[3]);
+			y = Integer.parseInt(items[5]);
 		}
 		return true;
 	}
@@ -53,23 +51,26 @@ public class AltosMag implements Cloneable {
 		AltosMag n = new AltosMag();
 
 		n.x = x;
-		n.y = y;
 		n.z = z;
+		n.y = y;
 		return n;
 	}
 
 	public AltosMag() {
 		x = AltosLib.MISSING;
-		y = AltosLib.MISSING;
 		z = AltosLib.MISSING;
+		y = AltosLib.MISSING;
 	}
 
-	static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException {
+	static public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException {
 		try {
 			AltosMag	mag = new AltosMag(link);
+			AltosCalData	cal_data = listener.cal_data();
 
 			if (mag != null)
-				state.set_mag(mag);
+				listener.set_mag(cal_data.mag_along(mag.y),
+						 cal_data.mag_across(mag.x),
+						 cal_data.mag_through(mag.z));
 		} catch (TimeoutException te) {
 		}
 	}