projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add support for 115200 baud serial rates
[fw/altos]
/
src
/
cc1111
/
ao_adc.c
diff --git
a/src/cc1111/ao_adc.c
b/src/cc1111/ao_adc.c
index f80004104130c324c19cd4e68884edc4b5a208a4..bfdc418a6ca2ae204c4f80aaa14726c67c0cf65c 100644
(file)
--- 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;
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) {
/* TeleMetrum readings */
#if HAS_ACCEL_REF
if (sequence == 2) {