projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Timer 3 working with slower clock and all 16 bits.
[fw/altos]
/
altoslib
/
AltosState.java
diff --git
a/altoslib/AltosState.java
b/altoslib/AltosState.java
index e20ec9a7109dbcd493deac0b544f692f2e78cd38..2e4d8870e12684d5f6aa3ef6764f1338492f9281 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();
@@
-163,6
+165,8
@@
public class AltosState {
} else
pad_alt = ground_altitude;
} else
pad_alt = ground_altitude;
+ data.new_gps = false;
+
gps_waiting = MIN_PAD_SAMPLES - npad;
if (gps_waiting < 0)
gps_waiting = 0;
gps_waiting = MIN_PAD_SAMPLES - npad;
if (gps_waiting < 0)
gps_waiting = 0;