projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
telegps: Get telegps application working again
[fw/altos]
/
altoslib
/
AltosEepromRecordFireTwo.java
diff --git
a/altoslib/AltosEepromRecordFireTwo.java
b/altoslib/AltosEepromRecordFireTwo.java
index a430bd97c86a6bae0ca7b6e534f10615e15a1e51..713d0bb71fc182ba45ef9cf11b0cb32d8bfb17ce 100644
(file)
--- a/
altoslib/AltosEepromRecordFireTwo.java
+++ b/
altoslib/AltosEepromRecordFireTwo.java
@@
-68,21
+68,19
@@
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(AltosFlightListener state
) {
- super.
update_state(state
);
+ public void
provide_data(AltosDataListener listener, AltosCalData cal_data
) {
+ super.
provide_data(listener, cal_data
);
switch (cmd()) {
case AltosLib.AO_LOG_FLIGHT:
switch (cmd()) {
case AltosLib.AO_LOG_FLIGHT:
- state.set_flight(flight());
- state.set_ground_pressure(0.0);
- state.set_accel_g(0, -1);
+ cal_data.set_flight(flight());
break;
case AltosLib.AO_LOG_STATE:
break;
case AltosLib.AO_LOG_STATE:
-
state
.set_state(state());
+
listener
.set_state(state());
break;
case AltosLib.AO_LOG_SENSOR:
break;
case AltosLib.AO_LOG_SENSOR:
-
state
.set_pressure(adc_to_pa(pres()));
-
state.set_accel
(adc_to_n(thrust()));
+
listener
.set_pressure(adc_to_pa(pres()));
+
listener.set_thrust
(adc_to_n(thrust()));
break;
}
}
break;
}
}