projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
altoslib
/
AltosState.java
diff --git
a/altoslib/AltosState.java
b/altoslib/AltosState.java
index e20ec9a7109dbcd493deac0b544f692f2e78cd38..2806812e4fc9f992b2fd7447eb2913eedf6b1670 100644
(file)
--- a/
altoslib/AltosState.java
+++ b/
altoslib/AltosState.java
@@
-38,6
+38,7
@@
public class AltosState {
public boolean boost; /* under power */
public double ground_altitude;
public boolean boost; /* under power */
public double ground_altitude;
+ public double altitude;
public double height;
public double speed;
public double acceleration;
public double height;
public double speed;
public double acceleration;
@@
-76,12
+77,13
@@
public class AltosState {
public double speak_altitude;
public void init (AltosRecord cur, AltosState prev_state) {
public double speak_altitude;
public void init (AltosRecord cur, AltosState prev_state) {
-
int
i;
- AltosRecord prev;
+
//int
i;
+
//
AltosRecord prev;
data = cur;
ground_altitude = data.ground_altitude();
data = cur;
ground_altitude = data.ground_altitude();
+ altitude = data.raw_altitude();
height = data.filtered_height();
report_time = System.currentTimeMillis();
height = data.filtered_height();
report_time = System.currentTimeMillis();