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_flight_test.c | |
| parent | ea4cdfb87e03ecfb974f98305671265b6fb95372 (diff) | |
| parent | cf550f9b96fa94d8db559e01df0e265bb1c7b572 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/ao_flight_test.c')
| -rw-r--r-- | src/ao_flight_test.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ao_flight_test.c b/src/ao_flight_test.c index e0cfa47a..5c619518 100644 --- a/src/ao_flight_test.c +++ b/src/ao_flight_test.c @@ -180,7 +180,7 @@ void ao_sleep(void *wchan) { ao_dump_state(); - if (wchan == &ao_adc_ring) { + if (wchan == &ao_adc_head) { char type; uint16_t tick; uint16_t a, b; @@ -238,6 +238,8 @@ ao_sleep(void *wchan) switch (type) { case 'F': ao_flight_ground_accel = a; + ao_config.accel_plus_g = a; + ao_config.accel_minus_g = a + 530; ao_flight_started = 1; break; case 'S': |