projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cc1111: Rework ADC configuration a bit, fix Tm V2 ADC usage
[fw/altos]
/
src
/
telemini-v2.0
/
ao_pins.h
diff --git
a/src/telemini-v2.0/ao_pins.h
b/src/telemini-v2.0/ao_pins.h
index 9ecd076e4e12f6e9c86d07fb6d95867e2a3f5636..fac6c535e60176aab569885a7970f7024be858bc 100644
(file)
--- a/
src/telemini-v2.0/ao_pins.h
+++ b/
src/telemini-v2.0/ao_pins.h
@@
-31,7
+31,6
@@
#define USE_INTERNAL_FLASH 0
#define HAS_DBG 0
#define PACKET_HAS_SLAVE 1
#define USE_INTERNAL_FLASH 0
#define HAS_DBG 0
#define PACKET_HAS_SLAVE 1
-#define USE_FAST_ASCENT_LOG 1
#define AO_LED_GREEN 1
#define AO_LED_RED 2
#define AO_LED_GREEN 1
#define AO_LED_RED 2
@@
-127,6
+126,8
@@
struct ao_adc {
printf("tick: %5u apogee: %5d main: %5d batt: %5d\n", \
(p)->tick, (p)->adc.sense_a, (p)->adc.sense_m, (p)->adc.v_batt)
printf("tick: %5u apogee: %5d main: %5d batt: %5d\n", \
(p)->tick, (p)->adc.sense_a, (p)->adc.sense_m, (p)->adc.v_batt)
+#define AO_ADC_PINS ((1 << 0) | (1 << 1) | (1 << 4))
+
#define FETCH_ADC() \
a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc); \
switch (sequence) { \
#define FETCH_ADC() \
a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc); \
switch (sequence) { \
@@
-142,7
+143,11
@@
struct ao_adc {
sequence = 1; \
break; \
} \
sequence = 1; \
break; \
} \
- if (sequence) \
- ;
+ a[0] = ADCL; \
+ a[1] = ADCH; \
+ if (sequence) { \
+ ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | sequence; \
+ return; \
+ }
#endif /* _AO_PINS_H_ */
#endif /* _AO_PINS_H_ */