projects
/
fw
/
altos
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
07956b1
)
Fake thrust data as accel for now
author
Keith Packard
<keithp@keithp.com>
Wed, 26 Apr 2017 06:56:41 +0000
(23:56 -0700)
committer
Keith Packard
<keithp@keithp.com>
Wed, 26 Apr 2017 06:56:57 +0000
(23:56 -0700)
altoslib/AltosEepromFireTwo.java
patch
|
blob
|
history
diff --git
a/altoslib/AltosEepromFireTwo.java
b/altoslib/AltosEepromFireTwo.java
index dd510280578319a0ab1511edb4f94adec1a0419f..14a026a9b5d83749a3547fa1f327cd75b1890beb 100644
(file)
--- a/
altoslib/AltosEepromFireTwo.java
+++ b/
altoslib/AltosEepromFireTwo.java
@@
-78,12
+78,14
@@
public class AltosEepromFireTwo extends AltosEeprom {
case AltosLib.AO_LOG_FLIGHT:
state.set_flight(flight());
state.set_ground_pressure(adc_to_pa(idle_pres()));
+ state.set_accel_g(0, -1);
break;
case AltosLib.AO_LOG_STATE:
state.set_state(state());
break;
case AltosLib.AO_LOG_SENSOR:
state.set_pressure(adc_to_pa(pres()));
+ state.set_accel(firetwo_adc(thrust()) * 100);
break;
}
}