diff options
| author | Keith Packard <keithp@keithp.com> | 2012-12-25 14:20:42 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-12-25 14:20:42 -0800 |
| commit | 868ef0c9c4b208c02a87180b0eede329369bdc77 (patch) | |
| tree | 1f20d312d56bac34bad12f287629a2651bbbccf8 /src/cc1111/ao_adc.c | |
| parent | 669cde8a87d88ceae89e369c1d38b88c9f8198cf (diff) | |
| parent | 57487e78b90465a21c87cf30deb0aeaba0887332 (diff) | |
Merge branch 'master' into micropeak-logging
Diffstat (limited to 'src/cc1111/ao_adc.c')
| -rw-r--r-- | src/cc1111/ao_adc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cc1111/ao_adc.c b/src/cc1111/ao_adc.c index f8000410..bfdc418a 100644 --- a/src/cc1111/ao_adc.c +++ b/src/cc1111/ao_adc.c @@ -56,7 +56,7 @@ ao_adc_isr(void) __interrupt 1 uint8_t __xdata *a; sequence = (ADCCON2 & ADCCON2_SCH_MASK) >> ADCCON2_SCH_SHIFT; -#if TELEMETRUM_V_0_1 || TELEMETRUM_V_0_2 || TELEMETRUM_V_1_0 || TELEMETRUM_V_1_1 || TELEMETRUM_V_1_2 || TELELAUNCH_V_0_1 +#if TELEMETRUM_V_0_1 || TELEMETRUM_V_0_2 || TELEMETRUM_V_1_0 || TELEMETRUM_V_1_1 || TELEMETRUM_V_1_2 || TELELAUNCH_V_0_1 || TELEBALLOON_V_1_1 /* TeleMetrum readings */ #if HAS_ACCEL_REF if (sequence == 2) { |