projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: Update for 1.8.1
[fw/altos]
/
altoslib
/
AltosMag.java
diff --git
a/altoslib/AltosMag.java
b/altoslib/AltosMag.java
index 56add8f3445da8d0de9fee7d2ec2f5150d4ee739..0d8ec69fec6ecf85bd448d988b4de25577169673 100644
(file)
--- 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
*
* 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
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,16
+16,24
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_
1
2;
import java.util.concurrent.*;
import java.util.concurrent.*;
+import java.io.*;
public class AltosMag implements Cloneable {
public int x;
public class AltosMag implements Cloneable {
public int x;
- public int y;
public int z;
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) {
public boolean parse_string(String line) {
+
if (!line.startsWith("X:"))
return false;
if (!line.startsWith("X:"))
return false;
@@
-32,8
+41,8
@@
public class AltosMag implements Cloneable {
if (items.length >= 6) {
x = Integer.parseInt(items[1]);
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;
}
}
return true;
}
@@
-42,25
+51,27
@@
public class AltosMag implements Cloneable {
AltosMag n = new AltosMag();
n.x = x;
AltosMag n = new AltosMag();
n.x = x;
- n.y = y;
n.z = z;
n.z = z;
+ n.y = y;
return n;
}
public AltosMag() {
x = AltosLib.MISSING;
return n;
}
public AltosMag() {
x = AltosLib.MISSING;
- y = AltosLib.MISSING;
z = AltosLib.MISSING;
z = AltosLib.MISSING;
+ y = AltosLib.MISSING;
}
}
- static public void
update_state(AltosState state, AltosLink link, AltosConfigData config_data)
{
+ static public void
provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException
{
try {
AltosMag mag = new AltosMag(link);
try {
AltosMag mag = new AltosMag(link);
+ AltosCalData cal_data = listener.cal_data();
if (mag != null)
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) {
} catch (TimeoutException te) {
- } catch (InterruptedException ie) {
}
}
}
}
@@
-77,4
+88,3
@@
public class AltosMag implements Cloneable {
}
}
}
}
}
}
-
\ No newline at end of file