projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
telefiretwo: don't try to record pre-burn sensor values in FLIGHT record
[fw/altos]
/
altoslib
/
AltosEepromRecordFireTwo.java
diff --git
a/altoslib/AltosEepromRecordFireTwo.java
b/altoslib/AltosEepromRecordFireTwo.java
index dd9e34e1425e10309e09871fd55ea28e4209fe6b..809247c798e5ed2699e1c8b27e58c875809abd4a 100644
(file)
--- a/
altoslib/AltosEepromRecordFireTwo.java
+++ b/
altoslib/AltosEepromRecordFireTwo.java
@@
-27,8
+27,6
@@
public class AltosEepromRecordFireTwo extends AltosEepromRecord {
/* AO_LOG_FLIGHT elements */
public int flight() { return data16(0); }
/* AO_LOG_FLIGHT elements */
public int flight() { return data16(0); }
- public int idle_pres() { return data16(2); }
- public int idle_thrust() { return data16(4); }
/* AO_LOG_STATE elements */
public int state() { return data16(0); }
/* AO_LOG_STATE elements */
public int state() { return data16(0); }
@@
-76,7
+74,7
@@
public class AltosEepromRecordFireTwo extends AltosEepromRecord {
switch (cmd()) {
case AltosLib.AO_LOG_FLIGHT:
state.set_flight(flight());
switch (cmd()) {
case AltosLib.AO_LOG_FLIGHT:
state.set_flight(flight());
- state.set_ground_pressure(
adc_to_pa(idle_pres())
);
+ state.set_ground_pressure(
0.0
);
state.set_accel_g(0, -1);
break;
case AltosLib.AO_LOG_STATE:
state.set_accel_g(0, -1);
break;
case AltosLib.AO_LOG_STATE: