summaryrefslogtreecommitdiff
path: root/src/cc1111/ao_adc.c
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2013-07-30 00:15:06 -0600
committerBdale Garbee <bdale@gag.com>2013-07-30 00:15:06 -0600
commit01f8df088759ee7e6bc3900a013e0ea4fafaf984 (patch)
tree3821af32f96f1ac1be04e48e0b1dee953fac7d62 /src/cc1111/ao_adc.c
parente2ebe60adf061479a1259a5c68b9cd5f5bacf644 (diff)
parent15063cbb8f76bffea71575d295ca87b7ceca36d8 (diff)
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/cc1111/ao_adc.c')
-rw-r--r--src/cc1111/ao_adc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cc1111/ao_adc.c b/src/cc1111/ao_adc.c
index ed76179b..4a58023d 100644
--- a/src/cc1111/ao_adc.c
+++ b/src/cc1111/ao_adc.c
@@ -144,7 +144,7 @@ ao_adc_isr(void) __interrupt 1
}
#endif /* telemini || telenano */
-#ifdef TELEFIRE_V_0_1
+#if defined(TELEFIRE_V_0_1) || defined(TELEFIRE_V_0_2)
a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc.sense[0] + sequence - AO_ADC_FIRST_PIN);
a[0] = ADCL;
a[1] = ADCH;