projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change barometer conversion code to shrink conversion table
[fw/altos]
/
src
/
ao_adc.c
diff --git
a/src/ao_adc.c
b/src/ao_adc.c
index a8784667c52490fea86d48077c2b8e02d686c677..2b972e6cd087d041e67d9c81cfb2383f065efa56 100644
(file)
--- a/
src/ao_adc.c
+++ b/
src/ao_adc.c
@@
-46,12
+46,18
@@
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 (sequence == ADCCON3_ECH_TEMP)
+ sequence = 2;
a = (uint8_t __xdata *) (&ao_adc_ring[ao_adc_head].accel + sequence);
a[0] = ADCL;
a[1] = ADCH;
if (sequence < 5) {
/* start next channel conversion */
a = (uint8_t __xdata *) (&ao_adc_ring[ao_adc_head].accel + sequence);
a[0] = ADCL;
a[1] = ADCH;
if (sequence < 5) {
/* start next channel conversion */
- ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | (sequence + 1);
+ /* v0.2 replaces external temp sensor with internal one */
+ if (sequence == 1)
+ ADCCON3 = ADCCON3_EREF_1_25 | ADCCON3_EDIV_512 | ADCCON3_ECH_TEMP;
+ else
+ ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | (sequence + 1);
} else {
/* record this conversion series */
ao_adc_ring[ao_adc_head].tick = ao_time();
} else {
/* record this conversion series */
ao_adc_ring[ao_adc_head].tick = ao_time();
@@
-80,7
+86,7
@@
ao_adc_init(void)
{
ADCCFG = ((1 << 0) | /* acceleration */
(1 << 1) | /* pressure */
{
ADCCFG = ((1 << 0) | /* acceleration */
(1 << 1) | /* pressure */
-
(1 << 2) | /*
temperature */
+
/* (1 << 2) | v0.1
temperature */
(1 << 3) | /* battery voltage */
(1 << 4) | /* drogue sense */
(1 << 5)); /* main sense */
(1 << 3) | /* battery voltage */
(1 << 4) | /* drogue sense */
(1 << 5)); /* main sense */