diff options
| author | Bdale Garbee <bdale@gag.com> | 2011-01-17 09:50:17 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2011-01-17 09:50:17 -0700 |
| commit | da42f406e88ccc821cd45d5a94d5afec65ec50e9 (patch) | |
| tree | 53482327b8f5d49d052c42943510b4524b6a9d21 /src/ao_config.c | |
| parent | ea4cdfb87e03ecfb974f98305671265b6fb95372 (diff) | |
| parent | cf550f9b96fa94d8db559e01df0e265bb1c7b572 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/ao_config.c')
| -rw-r--r-- | src/ao_config.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ao_config.c b/src/ao_config.c index e97b7eb1..bbee3b44 100644 --- a/src/ao_config.c +++ b/src/ao_config.c @@ -209,10 +209,10 @@ ao_config_accel_calibrate_auto(char *orientation) __reentrant puts("Calibrating..."); flush(); i = ACCEL_CALIBRATE_SAMPLES; accel_total = 0; - cal_adc_ring = ao_adc_head; + cal_adc_ring = ao_flight_adc; while (i) { - ao_sleep(&ao_adc_ring); - while (i && cal_adc_ring != ao_adc_head) { + ao_sleep(DATA_TO_XDATA(&ao_flight_adc)); + while (i && cal_adc_ring != ao_flight_adc) { accel_total += (int32_t) ao_adc_ring[cal_adc_ring].accel; cal_adc_ring = ao_adc_ring_next(cal_adc_ring); i--; |