diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-05-06 18:13:12 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-05-06 18:13:12 -0600 |
| commit | 4c20fdfa543059739b756171b991d430789cded1 (patch) | |
| tree | f39e6c729364211bf0570c459c37b576ecf9faa9 /src/kernel/ao_flight.c | |
| parent | e58dd78bcb749315f84168c83a74cf80851bf815 (diff) | |
| parent | 2f0c977c747824d0798550ac64eceb1d66c50efd (diff) | |
Merge branch 'branch-1.6' into debian
Diffstat (limited to 'src/kernel/ao_flight.c')
| -rw-r--r-- | src/kernel/ao_flight.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/kernel/ao_flight.c b/src/kernel/ao_flight.c index 251dbc02..9ba02bb8 100644 --- a/src/kernel/ao_flight.c +++ b/src/kernel/ao_flight.c @@ -370,8 +370,10 @@ ao_flight(void) { ao_flight_state = ao_flight_landed; +#if HAS_ADC /* turn off the ADC capture */ ao_timer_set_adc_interval(0); +#endif ao_wakeup(DATA_TO_XDATA(&ao_flight_state)); } |