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.6' into debian
[fw/altos]
/
altoslib
/
AltosTelemetryMetrumSensor.java
diff --git
a/altoslib/AltosTelemetryMetrumSensor.java
b/altoslib/AltosTelemetryMetrumSensor.java
index 232468bbf67ca5967d42f4d4f8996f1ffee09b5c..1b405f2b509a0bcd96f73f37c21d6efbbd4224ea 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_
3
;
+package org.altusmetrum.altoslib_
10
;
public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
@@
-27,7
+27,7
@@
public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
int acceleration;
int speed;
int acceleration;
int speed;
- int height;
+ int height
_16
;
int v_batt;
int sense_a;
int v_batt;
int sense_a;
@@
-43,7
+43,7
@@
public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
acceleration = int16(14);
speed = int16(16);
acceleration = int16(14);
speed = int16(16);
- height
= int16(18);
+ height
_16
= int16(18);
v_batt = int16(20);
sense_a = int16(22);
v_batt = int16(20);
sense_a = int16(22);
@@
-59,7
+59,8
@@
public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
state.set_pressure(pres);
state.set_temperature(temp/100.0);
state.set_pressure(pres);
state.set_temperature(temp/100.0);
- state.set_kalman(height, speed/16.0, acceleration/16.0);
+ state.set_kalman(extend_height(state, height_16),
+ speed/16.0, acceleration/16.0);
state.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt));
state.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt));