projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/test: Add baro-only flight test program
[fw/altos]
/
src
/
ao_adc.c
diff --git
a/src/ao_adc.c
b/src/ao_adc.c
index 49d2519e209d5c4f2faf594c5afb08da9da42af6..9990a1fdaeecf75df906339d56a0b56bcebc0685 100644
(file)
--- a/
src/ao_adc.c
+++ b/
src/ao_adc.c
@@
-19,24
+19,25
@@
#include "ao_pins.h"
volatile __xdata struct ao_adc ao_adc_ring[AO_ADC_RING];
#include "ao_pins.h"
volatile __xdata struct ao_adc ao_adc_ring[AO_ADC_RING];
+#if HAS_ACCEL_REF
+volatile __xdata uint16_t ao_accel_ref[AO_ADC_RING];
+#endif
volatile __data uint8_t ao_adc_head;
void
ao_adc_poll(void)
{
volatile __data uint8_t ao_adc_head;
void
ao_adc_poll(void)
{
+#if HAS_ACCEL_REF
+ ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 2;
+#else
ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 0;
ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 0;
-}
-
-void
-ao_adc_sleep(void)
-{
- ao_sleep(&ao_adc_ring);
+#endif
}
void
ao_adc_get(__xdata struct ao_adc *packet)
{
}
void
ao_adc_get(__xdata struct ao_adc *packet)
{
- uint8_t i = ao_adc_ring_prev(ao_
adc_head
);
+ uint8_t i = ao_adc_ring_prev(ao_
flight_adc
);
memcpy(packet, &ao_adc_ring[i], sizeof (struct ao_adc));
}
memcpy(packet, &ao_adc_ring[i], sizeof (struct ao_adc));
}
@@
-47,25
+48,34
@@
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);
+#if HAS_ACCEL_REF
+ if (sequence == 2) {
+ a = (uint8_t __xdata *) (&ao_accel_ref[ao_adc_head]);
+ sequence = 0;
+ } else
+#endif
+ {
+ if (sequence == ADCCON3_ECH_TEMP)
+ sequence = 2;
+ a = (uint8_t __xdata *) (&ao_adc_ring[ao_adc_head].accel + sequence);
+ sequence++;
+ }
a[0] = ADCL;
a[1] = ADCH;
a[0] = ADCL;
a[1] = ADCH;
- if (sequence <
5
) {
+ if (sequence <
6
) {
#if HAS_EXTERNAL_TEMP == 0
/* start next channel conversion */
/* v0.2 replaces external temp sensor with internal one */
#if HAS_EXTERNAL_TEMP == 0
/* start next channel conversion */
/* v0.2 replaces external temp sensor with internal one */
- if (sequence ==
1
)
+ if (sequence ==
2
)
ADCCON3 = ADCCON3_EREF_1_25 | ADCCON3_EDIV_512 | ADCCON3_ECH_TEMP;
else
#endif
ADCCON3 = ADCCON3_EREF_1_25 | ADCCON3_EDIV_512 | ADCCON3_ECH_TEMP;
else
#endif
- ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 |
(sequence + 1)
;
+ ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 |
sequence
;
} else {
/* record this conversion series */
ao_adc_ring[ao_adc_head].tick = ao_time();
ao_adc_head = ao_adc_ring_next(ao_adc_head);
} else {
/* record this conversion series */
ao_adc_ring[ao_adc_head].tick = ao_time();
ao_adc_head = ao_adc_ring_next(ao_adc_head);
- ao_wakeup(
ao_adc_ring
);
+ ao_wakeup(
DATA_TO_XDATA(&ao_adc_head)
);
}
}
}
}
@@
-80,8
+90,8
@@
ao_adc_dump(void) __reentrant
}
__code struct ao_cmds ao_adc_cmds[] = {
}
__code struct ao_cmds ao_adc_cmds[] = {
- {
'a', ao_adc_dump, "a
Display current ADC values" },
- { 0,
ao_adc_dump,
NULL },
+ {
ao_adc_dump, "a\0
Display current ADC values" },
+ { 0, NULL },
};
void
};
void