projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Only plot acceleration when present in data file
[fw/altos]
/
altosui
/
AltosRecord.java
diff --git
a/altosui/AltosRecord.java
b/altosui/AltosRecord.java
index 46e96b95de6e660a4a4350cce140660cc5615ba7..200fffe5db993e1a7336fe2add88ff412dcb4482 100644
(file)
--- a/
altosui/AltosRecord.java
+++ b/
altosui/AltosRecord.java
@@
-139,7
+139,7
@@
public class AltosRecord {
double g = ground_altitude();
if (r == MISSING || g == MISSING)
double g = ground_altitude();
if (r == MISSING || g == MISSING)
- return
MISSING
;
+ return
height
;
return r - g;
}
return r - g;
}
@@
-246,6
+246,9
@@
public class AltosRecord {
ground_pres = old.ground_pres;
accel_plus_g = old.accel_plus_g;
accel_minus_g = old.accel_minus_g;
ground_pres = old.ground_pres;
accel_plus_g = old.accel_plus_g;
accel_minus_g = old.accel_minus_g;
+ acceleration = old.acceleration;
+ speed = old.speed;
+ height = old.height;
gps = new AltosGPS(old.gps);
}
gps = new AltosGPS(old.gps);
}
@@
-258,12
+261,12
@@
public class AltosRecord {
status = 0;
state = Altos.ao_flight_startup;
tick = 0;
status = 0;
state = Altos.ao_flight_startup;
tick = 0;
- accel =
0
;
- pres =
0
;
- temp =
0
;
- batt =
0
;
- drogue =
0
;
- main =
0
;
+ accel =
MISSING
;
+ pres =
MISSING
;
+ temp =
MISSING
;
+ batt =
MISSING
;
+ drogue =
MISSING
;
+ main =
MISSING
;
flight_accel = 0;
ground_accel = 0;
flight_vel = 0;
flight_accel = 0;
ground_accel = 0;
flight_vel = 0;
@@
-271,6
+274,9
@@
public class AltosRecord {
ground_pres = 0;
accel_plus_g = 0;
accel_minus_g = 0;
ground_pres = 0;
accel_plus_g = 0;
accel_minus_g = 0;
+ acceleration = MISSING;
+ speed = MISSING;
+ height = MISSING;
gps = new AltosGPS();
}
}
gps = new AltosGPS();
}
}