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' into new-state
[fw/altos]
/
altoslib
/
AltosRecord.java
diff --git
a/altoslib/AltosRecord.java
b/altoslib/AltosRecord.java
index 5e4ed927a28dad427e648484f18e2286f25ddbbf..0c8e1db9f1c9def66f8c186033cf3e65632be246 100644
(file)
--- a/
altoslib/AltosRecord.java
+++ b/
altoslib/AltosRecord.java
@@
-56,6
+56,10
@@
public class AltosRecord implements Comparable <AltosRecord>, Cloneable {
public int flight_log_max;
public String firmware_version;
public int flight_log_max;
public String firmware_version;
+ public double accel_plus_g, accel_minus_g;
+ public double ground_accel;
+ public double accel;
+
public AltosRecordCompanion companion;
/* Telemetry sources have these values recorded from the flight computer */
public AltosRecordCompanion companion;
/* Telemetry sources have these values recorded from the flight computer */
@@
-167,5
+171,9
@@
public class AltosRecord implements Comparable <AltosRecord>, Cloneable {
kalman_acceleration = MISSING;
kalman_speed = MISSING;
kalman_height = MISSING;
kalman_acceleration = MISSING;
kalman_speed = MISSING;
kalman_height = MISSING;
+
+ accel_plus_g = MISSING;
+ accel_minus_g = MISSING;
+
}
}
}
}