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_config.c
diff --git
a/src/ao_config.c
b/src/ao_config.c
index e97b7eb121192a41d1876fa530e9188d828e75e5..bbee3b443e6a0a7e17bfb9805af311dfba6e3982 100644
(file)
--- 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;
puts("Calibrating..."); flush();
i = ACCEL_CALIBRATE_SAMPLES;
accel_total = 0;
- cal_adc_ring = ao_
adc_head
;
+ cal_adc_ring = ao_
flight_adc
;
while (i) {
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--;
accel_total += (int32_t) ao_adc_ring[cal_adc_ring].accel;
cal_adc_ring = ao_adc_ring_next(cal_adc_ring);
i--;