projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Prefer averaged ground pres for ground alt computation
[fw/altos]
/
altoslib
/
AltosState.java
diff --git
a/altoslib/AltosState.java
b/altoslib/AltosState.java
index 5a805fc6bf6864b75a146b64a411746583084c48..a9bb1e70833392321b01097da560eb6819304f42 100644
(file)
--- a/
altoslib/AltosState.java
+++ b/
altoslib/AltosState.java
@@
-301,7
+301,8
@@
public class AltosState implements Cloneable {
class AltosGroundPressure extends AltosCValue {
void set_filtered(double p, double time) {
computed.set_filtered(p, time);
class AltosGroundPressure extends AltosCValue {
void set_filtered(double p, double time) {
computed.set_filtered(p, time);
- ground_altitude.set_computed(pressure_to_altitude(computed.value()), time);
+ if (!is_measured())
+ ground_altitude.set_computed(pressure_to_altitude(computed.value()), time);
}
void set_measured(double p, double time) {
}
void set_measured(double p, double time) {
@@
-657,6
+658,7
@@
public class AltosState implements Cloneable {
set = 0;
set = 0;
+ ground_pressure.copy(old.ground_pressure);
ground_altitude.copy(old.ground_altitude);
altitude.copy(old.altitude);
pressure.copy(old.pressure);
ground_altitude.copy(old.ground_altitude);
altitude.copy(old.altitude);
pressure.copy(old.pressure);