projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Change how speed/accel are computed from pressure
[fw/altos]
/
altoslib
/
AltosMag.java
diff --git
a/altoslib/AltosMag.java
b/altoslib/AltosMag.java
index 8784bb810faae410d49d8140a6993622039b756f..523a31a5edb90f8076a52db1863792c806fbfb4a 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,17
+16,17
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
5
;
+package org.altusmetrum.altoslib_
11
;
import java.util.concurrent.*;
import java.io.*;
import java.util.concurrent.*;
import java.io.*;
-public class AltosMag implements Cloneable
, Serializable
{
+public class AltosMag implements Cloneable {
public int along;
public int across;
public int through;
public int along;
public int across;
public int through;
- public static double counts_per_gauss = 1090;
+ public static
final
double counts_per_gauss = 1090;
public static double convert_gauss(double counts) {
return counts / counts_per_gauss;
public static double convert_gauss(double counts) {
return counts / counts_per_gauss;
@@
-71,12
+72,14
@@
public class AltosMag implements Cloneable, Serializable {
this.through = through;
}
this.through = through;
}
- static public void
update_state(AltosState state, AltosLink link, AltosConfigData config
_data) throws InterruptedException {
+ static public void
provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal
_data) throws InterruptedException {
try {
AltosMag mag = new AltosMag(link);
if (mag != null)
try {
AltosMag mag = new AltosMag(link);
if (mag != null)
- state.set_mag(mag);
+ listener.set_mag(cal_data.mag_along(mag.along),
+ cal_data.mag_across(mag.across),
+ cal_data.mag_through(mag.through));
} catch (TimeoutException te) {
}
}
} catch (TimeoutException te) {
}
}