*
* 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
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_13;
import java.util.concurrent.*;
+import java.io.*;
public class AltosMag implements Cloneable {
public int x;
- public int y;
public int z;
+ public int y;
+
+ public static final double counts_per_gauss = 1090;
+
+ 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;
if (items.length >= 6) {
x = Integer.parseInt(items[1]);
- y = Integer.parseInt(items[3]);
- z = Integer.parseInt(items[5]);
+ z = Integer.parseInt(items[3]);
+ y = Integer.parseInt(items[5]);
}
return true;
}
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) {
}
}
}
}
}
-
\ No newline at end of file