projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'branch-1.8' into debian
[fw/altos]
/
altoslib
/
AltosTelemetryMetrumSensor.java
diff --git
a/altoslib/AltosTelemetryMetrumSensor.java
b/altoslib/AltosTelemetryMetrumSensor.java
index 211f9c687fe10ec732e5fb5e780b835ae5dac6d8..79d3a499dcad7edde7443852bac42c4028484dce 100644
(file)
--- a/
altoslib/AltosTelemetryMetrumSensor.java
+++ b/
altoslib/AltosTelemetryMetrumSensor.java
@@
-38,13
+38,12
@@
public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
super(bytes);
}
super(bytes);
}
- public void provide_data(AltosDataListener listener
, AltosCalData cal_data
) {
- super.provide_data(listener
, cal_data
);
+ public void provide_data(AltosDataListener listener) {
+ super.provide_data(listener);
listener.set_state(state());
listener.set_state(state());
- cal_data.set_state(state());
- listener.set_acceleration(
cal_data
.acceleration(accel()));
+ listener.set_acceleration(
listener.cal_data()
.acceleration(accel()));
listener.set_pressure(pres());
listener.set_temperature(temp()/100.0);
listener.set_pressure(pres());
listener.set_temperature(temp()/100.0);