projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Fix ground station configure frequency list
[fw/altos]
/
altoslib
/
AltosState.java
diff --git
a/altoslib/AltosState.java
b/altoslib/AltosState.java
index 6926994c4292b7c6d19ef9e21ce98e32346f8767..b05cd3586061ad111d99084733f84865c360339e 100644
(file)
--- a/
altoslib/AltosState.java
+++ b/
altoslib/AltosState.java
@@
-481,7
+481,7
@@
public class AltosState implements Cloneable {
double g = ground_altitude();
if (a != AltosLib.MISSING && g != AltosLib.MISSING)
return a - g;
double g = ground_altitude();
if (a != AltosLib.MISSING && g != AltosLib.MISSING)
return a - g;
- return
AltosLib.MISSING
;
+ return
gps_height()
;
}
public double max_height() {
}
public double max_height() {
@@
-749,6
+749,7
@@
public class AltosState implements Cloneable {
speak_altitude = AltosLib.MISSING;
callsign = null;
speak_altitude = AltosLib.MISSING;
callsign = null;
+ firmware_version = null;
accel_plus_g = AltosLib.MISSING;
accel_minus_g = AltosLib.MISSING;
accel_plus_g = AltosLib.MISSING;
accel_minus_g = AltosLib.MISSING;
@@
-886,6
+887,7
@@
public class AltosState implements Cloneable {
speak_altitude = old.speak_altitude;
callsign = old.callsign;
speak_altitude = old.speak_altitude;
callsign = old.callsign;
+ firmware_version = old.firmware_version;
accel_plus_g = old.accel_plus_g;
accel_minus_g = old.accel_minus_g;
accel_plus_g = old.accel_plus_g;
accel_minus_g = old.accel_minus_g;
@@
-908,8
+910,8
@@
public class AltosState implements Cloneable {
}
void update_gps() {
}
void update_gps() {
- elevation =
0
;
- range =
-1
;
+ elevation =
AltosLib.MISSING
;
+ range =
AltosLib.MISSING
;
if (gps == null)
return;
if (gps == null)
return;