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' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
ao_flight_nano.c
diff --git
a/src/ao_flight_nano.c
b/src/ao_flight_nano.c
index 64c1d8dba26bbc02853138503cdca92a335f71b5..2e332b12837e3729dae82bb1490b9ae0d4d0ecb9 100644
(file)
--- a/
src/ao_flight_nano.c
+++ b/
src/ao_flight_nano.c
@@
-30,7
+30,7
@@
__pdata uint16_t ao_interval_end;
__pdata int16_t ao_interval_min_height;
__pdata int16_t ao_interval_max_height;
__pdata int16_t ao_interval_min_height;
__pdata int16_t ao_interval_max_height;
-__
x
data uint8_t ao_flight_force_idle;
+__
p
data uint8_t ao_flight_force_idle;
/* Landing is detected by getting constant readings from both pressure and accelerometer
* for a fairly long time (AO_INTERVAL_TICKS)
/* Landing is detected by getting constant readings from both pressure and accelerometer
* for a fairly long time (AO_INTERVAL_TICKS)
@@
-75,6
+75,10
@@
ao_flight_nano(void)
if (ao_height> AO_M_TO_HEIGHT(20)) {
ao_flight_state = ao_flight_drogue;
ao_launch_tick = ao_sample_tick;
if (ao_height> AO_M_TO_HEIGHT(20)) {
ao_flight_state = ao_flight_drogue;
ao_launch_tick = ao_sample_tick;
+
+ /* start logging data */
+ ao_log_start();
+
ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
}
break;
ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
}
break;