projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/telemini-v3.0: Finish initial turn-on
[fw/altos]
/
altoslib
/
AltosMag.java
diff --git
a/altoslib/AltosMag.java
b/altoslib/AltosMag.java
index 89e72bd6e5983153dcacb499011a254369aa946f..e89ec0debf5742abff50960451dd0006b02b3493 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,18
+16,25
@@
* 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_
11
;
import java.util.concurrent.*;
import java.util.concurrent.*;
+import java.io.*;
public class AltosMag implements Cloneable {
public class AltosMag implements Cloneable {
- public int x;
- public int y;
- public int z;
+ public int along;
+ public int across;
+ public int through;
+
+ 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")) {
public boolean parse_string(String line) {
// if (line.startsWith("Syntax error")) {
-//
x = y = z
= 0;
+//
along = across = through
= 0;
// return true;
// }
// return true;
// }
@@
-36,9
+44,9
@@
public class AltosMag implements Cloneable {
String[] items = line.split("\\s+");
if (items.length >= 6) {
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;
}
@@
-46,16
+54,22
@@
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) throws InterruptedException {
}
static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException {
@@
-81,4
+95,3
@@
public class AltosMag implements Cloneable {
}
}
}
}
}
}
-
\ No newline at end of file