projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add thrust as a graphable time series type
[fw/altos]
/
altoslib
/
AltosEepromRecordFireTwo.java
diff --git
a/altoslib/AltosEepromRecordFireTwo.java
b/altoslib/AltosEepromRecordFireTwo.java
index 8c03cd5657e9eec3fd0da949c20f163c0640a216..bfdd6cf898adc4f4f5aa4c22e68f96bdd9c90795 100644
(file)
--- a/
altoslib/AltosEepromRecordFireTwo.java
+++ b/
altoslib/AltosEepromRecordFireTwo.java
@@
-68,7
+68,7
@@
public class AltosEepromRecordFireTwo extends AltosEepromRecord {
return AltosConvert.lb_to_n(v * 298 * 9.807);
}
return AltosConvert.lb_to_n(v * 298 * 9.807);
}
- public void update_state(Altos
State
state) {
+ public void update_state(Altos
FlightListener
state) {
super.update_state(state);
switch (cmd()) {
super.update_state(state);
switch (cmd()) {
@@
-82,7
+82,7
@@
public class AltosEepromRecordFireTwo extends AltosEepromRecord {
break;
case AltosLib.AO_LOG_SENSOR:
state.set_pressure(adc_to_pa(pres()));
break;
case AltosLib.AO_LOG_SENSOR:
state.set_pressure(adc_to_pa(pres()));
- state.set_
accel
(adc_to_n(thrust()));
+ state.set_
thrust
(adc_to_n(thrust()));
break;
}
}
break;
}
}