projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: Add 1.3.2 release notes
[fw/altos]
/
altoslib
/
AltosMag.java
diff --git
a/altoslib/AltosMag.java
b/altoslib/AltosMag.java
index 56add8f3445da8d0de9fee7d2ec2f5150d4ee739..d2bb9da6fbe086430a92c03be434fb844a4b1bf0 100644
(file)
--- a/
altoslib/AltosMag.java
+++ b/
altoslib/AltosMag.java
@@
-15,25
+15,36
@@
* 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_
3
;
import java.util.concurrent.*;
public class AltosMag implements Cloneable {
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) {
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) {
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;
}
}
return true;
}
@@
-53,14
+64,13
@@
public class AltosMag implements Cloneable {
z = AltosLib.MISSING;
}
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) {
try {
AltosMag mag = new AltosMag(link);
if (mag != null)
state.set_mag(mag);
} catch (TimeoutException te) {
- } catch (InterruptedException ie) {
}
}
}
}