projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add the simplest possible viterbi decoder
[fw/altos]
/
src
/
cc1111
/
ao_adc.c
diff --git
a/src/cc1111/ao_adc.c
b/src/cc1111/ao_adc.c
index f34bc04227e35996d4d48c1970d18d2cad9c9cb1..ce827e2596ac7b576fc84056507e0e68cecf1dd1 100644
(file)
--- a/
src/cc1111/ao_adc.c
+++ b/
src/cc1111/ao_adc.c
@@
-52,11
+52,11
@@
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
IGNITE_ON_P2
+#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
/* TeleMetrum readings */
#if HAS_ACCEL_REF
if (sequence == 2) {
/* 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].a
dc.a
ccel_ref);
sequence = 0;
} else
#endif
sequence = 0;
} else
#endif
@@
-81,10
+81,10
@@
ao_adc_isr(void) __interrupt 1
}
#endif
}
#endif
-#if
IGNITE_ON_P0
+#if
TELEMINI_V_1_0 || TELENANO_V_0_1
/* TeleMini readings */
a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc.pres);
/* TeleMini readings */
a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc.pres);
-#if
def
TELEMINI_V_1_0
+#if TELEMINI_V_1_0
switch (sequence) {
case 0:
/* pressure */
switch (sequence) {
case 0:
/* pressure */
@@
-138,7
+138,8
@@
ao_adc_isr(void) __interrupt 1
/* Start next conversion */
ADCCON3 = sequence;
}
/* Start next conversion */
ADCCON3 = sequence;
}
-#endif
+#endif /* telemini || telenano */
+
#ifndef GOT_ADC
#error No known ADC configuration set
#endif
#ifndef GOT_ADC
#error No known ADC configuration set
#endif