projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
apply wrap-and-sort to control files
[fw/altos]
/
altoslib
/
AltosMag.java
diff --git
a/altoslib/AltosMag.java
b/altoslib/AltosMag.java
index 56add8f3445da8d0de9fee7d2ec2f5150d4ee739..351125bf407d6919d116e30d5e3d2a4e7159ce24 100644
(file)
--- a/
altoslib/AltosMag.java
+++ b/
altoslib/AltosMag.java
@@
-15,25
+15,37
@@
* 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_
8
;
import java.util.concurrent.*;
import java.util.concurrent.*;
+import java.io.*;
-public class AltosMag implements Cloneable {
- public int x;
- public int y;
- public int z;
+public class AltosMag implements Cloneable, Serializable {
+ public int along;
+ public int across;
+ public int through;
+
+ public static 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("Syntax error")) {
+// along = across = through = 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]);
+
along
= Integer.parseInt(items[1]);
+
across
= Integer.parseInt(items[3]);
+
through
= Integer.parseInt(items[5]);
}
return true;
}
}
return true;
}
@@
-41,26
+53,31
@@
public class AltosMag implements Cloneable {
public AltosMag clone() {
AltosMag n = new AltosMag();
public AltosMag clone() {
AltosMag n = new AltosMag();
- n.
x = x
;
- n.
y = y
;
- n.
z = z
;
+ n.
along = along
;
+ n.
across = across
;
+ n.
through = through
;
return n;
}
public AltosMag() {
return n;
}
public AltosMag() {
- x = AltosLib.MISSING;
- y = AltosLib.MISSING;
- z = AltosLib.MISSING;
+ along = AltosLib.MISSING;
+ across = AltosLib.MISSING;
+ through = AltosLib.MISSING;
+ }
+
+ public AltosMag(int along, int across, int through) {
+ this.along = along;
+ this.across = across;
+ this.through = through;
}
}
- 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) {
}
}
}
}
@@
-77,4
+94,3
@@
public class AltosMag implements Cloneable {
}
}
}
}
}
}
-
\ No newline at end of file