diff options
| author | Keith Packard <keithp@keithp.com> | 2012-06-01 23:07:38 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-06-01 23:07:38 -0700 |
| commit | c04af7533bd3fd3f3260338c0753fde966131720 (patch) | |
| tree | a965c742dcfc4dc1dd76e44aee0ddfd3fbf8b076 /src/cc1111 | |
| parent | 1824761f5b98e92485e2dd347b1c4d043ec207e2 (diff) | |
altos: Add support for MegaAccel daughter card.
Switches all acceleration computation to using the MegaAccel
accelerometer to ensure support for high-g flights.
MPU6000 values continue to be logged as normal
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/cc1111')
| -rw-r--r-- | src/cc1111/ao_adc.c | 2 | ||||
| -rw-r--r-- | src/cc1111/ao_arch.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/cc1111/ao_adc.c b/src/cc1111/ao_adc.c index 95643956..ce827e25 100644 --- a/src/cc1111/ao_adc.c +++ b/src/cc1111/ao_adc.c @@ -56,7 +56,7 @@ ao_adc_isr(void) __interrupt 1 /* TeleMetrum readings */ #if HAS_ACCEL_REF if (sequence == 2) { - a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].accel_ref); + a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc.accel_ref); sequence = 0; } else #endif diff --git a/src/cc1111/ao_arch.h b/src/cc1111/ao_arch.h index 704ae4f9..44116b81 100644 --- a/src/cc1111/ao_arch.h +++ b/src/cc1111/ao_arch.h @@ -205,6 +205,7 @@ struct ao_adc { int16_t v_batt; /* battery voltage */ int16_t sense_d; /* drogue continuity sense */ int16_t sense_m; /* main continuity sense */ + int16_t accel_ref; /* acceleration reference */ }; #define AO_DATA_RING 32 |