projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui/altoslib: add methods to interface, fix imports/exceptions in BT code
[fw/altos]
/
altoslib
/
AltosState.java
diff --git
a/altoslib/AltosState.java
b/altoslib/AltosState.java
index 68c7611f2adab67777f93eb07b18bff56b6e13cb..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();
@@
-160,7
+162,10
@@
public class AltosState {
}
ngps++;
}
}
ngps++;
}
- }
+ } else
+ pad_alt = ground_altitude;
+
+ data.new_gps = false;
gps_waiting = MIN_PAD_SAMPLES - npad;
if (gps_waiting < 0)
gps_waiting = MIN_PAD_SAMPLES - npad;
if (gps_waiting < 0)
@@
-173,14
+178,14
@@
public class AltosState {
boost = (AltosLib.ao_flight_boost == state);
/* Only look at accelerometer data under boost */
boost = (AltosLib.ao_flight_boost == state);
/* Only look at accelerometer data under boost */
- if (boost && acceleration > max_acceleration)
+ if (boost && acceleration > max_acceleration
&& acceleration != AltosRecord.MISSING
)
max_acceleration = acceleration;
max_acceleration = acceleration;
- if (boost && speed > max_speed)
+ if (boost && speed > max_speed
&& speed != AltosRecord.MISSING
)
max_speed = speed;
max_speed = speed;
- if (boost && baro_speed > max_baro_speed)
+ if (boost && baro_speed > max_baro_speed
&& baro_speed != AltosRecord.MISSING
)
max_baro_speed = baro_speed;
max_baro_speed = baro_speed;
- if (height > max_height)
+ if (height > max_height
&& height != AltosRecord.MISSING
)
max_height = height;
if (data.gps != null) {
if (gps == null || !gps.locked || data.gps.locked)
max_height = height;
if (data.gps != null) {
if (gps == null || !gps.locked || data.gps.locked)