projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore 32 and 64 bit cjnitest apps
[fw/altos]
/
altoslib
/
AltosTelemetryMetrumSensor.java
diff --git
a/altoslib/AltosTelemetryMetrumSensor.java
b/altoslib/AltosTelemetryMetrumSensor.java
index 2a2a3e5ba72a8382c14c0a6509a21b58aea99cd4..232468bbf67ca5967d42f4d4f8996f1ffee09b5c 100644
(file)
--- a/
altoslib/AltosTelemetryMetrumSensor.java
+++ b/
altoslib/AltosTelemetryMetrumSensor.java
@@
-15,7
+15,7
@@
* 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
;
public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
@@
-56,7
+56,8
@@
public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
state.set_state(this.state);
state.set_accel(accel);
state.set_state(this.state);
state.set_accel(accel);
- state.set_ms5607(pres, temp);
+ state.set_pressure(pres);
+ state.set_temperature(temp/100.0);
state.set_kalman(height, speed/16.0, acceleration/16.0);
state.set_kalman(height, speed/16.0, acceleration/16.0);