projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: NumberFormat can't be shared between parsers
[fw/altos]
/
altoslib
/
AltosTelemetryMetrumSensor.java
diff --git
a/altoslib/AltosTelemetryMetrumSensor.java
b/altoslib/AltosTelemetryMetrumSensor.java
index e666f4ec29939c85c2d2e948e53636df5c9e56fc..383f645ad7e2244c5b4bbe3573155873152ac7d0 100644
(file)
--- a/
altoslib/AltosTelemetryMetrumSensor.java
+++ b/
altoslib/AltosTelemetryMetrumSensor.java
@@
-16,7
+16,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_1
1
;
+package org.altusmetrum.altoslib_1
3
;
public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
@@
-38,21
+38,20
@@
public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
super(bytes);
}
super(bytes);
}
- public void
update_state(AltosState state
) {
- super.
update_state(state
);
+ public void
provide_data(AltosDataListener listener
) {
+ super.
provide_data(listener
);
-
state
.set_state(state());
+
listener
.set_state(state());
-
state.set_accel(accel(
));
-
state
.set_pressure(pres());
-
state
.set_temperature(temp()/100.0);
+
listener.set_acceleration(listener.cal_data().acceleration(accel()
));
+
listener
.set_pressure(pres());
+
listener
.set_temperature(temp()/100.0);
- state.set_kalman(extend_height(state, height_16()),
- speed()/16.0, acceleration()/16.0);
+ listener.set_kalman(height_16(), speed()/16.0, acceleration()/16.0);
-
state
.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt()));
+
listener
.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt()));
-
state
.set_apogee_voltage(AltosConvert.mega_pyro_voltage(sense_a()));
-
state
.set_main_voltage(AltosConvert.mega_pyro_voltage(sense_m()));
+
listener
.set_apogee_voltage(AltosConvert.mega_pyro_voltage(sense_a()));
+
listener
.set_main_voltage(AltosConvert.mega_pyro_voltage(sense_m()));
}
}
}
}