projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Add TeleMega v4.0 firmware to altosui packaged bits
[fw/altos]
/
altoslib
/
AltosState.java
diff --git
a/altoslib/AltosState.java
b/altoslib/AltosState.java
index b3bcff925cfe9ed390cbb0ae46ad4d0ebccfed0d..eea7a9c6760c1bfd4acd7cd86aa0c63c334c66f7 100644
(file)
--- a/
altoslib/AltosState.java
+++ b/
altoslib/AltosState.java
@@
-513,26
+513,27
@@
public class AltosState extends AltosDataListener {
}
public double height() {
}
public double height() {
- double k = kalman_height.value();
- if (k != AltosLib.MISSING)
- return k;
-
double b = baro_height();
if (b != AltosLib.MISSING)
return b;
double b = baro_height();
if (b != AltosLib.MISSING)
return b;
+ double k = kalman_height.value();
+ if (k != AltosLib.MISSING)
+ return k;
+
return gps_height();
}
public double max_height() {
return gps_height();
}
public double max_height() {
- double k = kalman_height.max();
- if (k != AltosLib.MISSING)
- return k;
-
double a = altitude.max();
double g = ground_altitude();
if (a != AltosLib.MISSING && g != AltosLib.MISSING)
return a - g;
double a = altitude.max();
double g = ground_altitude();
if (a != AltosLib.MISSING && g != AltosLib.MISSING)
return a - g;
+
+ double k = kalman_height.max();
+ if (k != AltosLib.MISSING)
+ return k;
+
return max_gps_height();
}
return max_gps_height();
}
@@
-860,10
+861,6
@@
public class AltosState extends AltosDataListener {
}
}
}
}
- public String state_name() {
- return AltosLib.state_name(state());
- }
-
public void set_state(int state) {
super.set_state(state);
ascent = (AltosLib.ao_flight_boost <= state() &&
public void set_state(int state) {
super.set_state(state);
ascent = (AltosLib.ao_flight_boost <= state() &&
@@
-888,8
+885,8
@@
public class AltosState extends AltosDataListener {
received_time = ms;
}
received_time = ms;
}
- public void set_gps(AltosGPS gps) {
- super.set_gps(gps);
+ public void set_gps(AltosGPS gps
, boolean set_location, boolean set_sats
) {
+ super.set_gps(gps
, set_location, set_sats
);
if (gps != null) {
this.gps = gps;
update_gps();
if (gps != null) {
this.gps = gps;
update_gps();