projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Make cc1111 radio control functions static
[fw/altos]
/
src
/
avr
/
ao_adc_avr.c
diff --git
a/src/avr/ao_adc_avr.c
b/src/avr/ao_adc_avr.c
index a47703e576df875286dc4707b515666b4bcf2277..928cd3e13f55d654bdba4ab5e8d369446d6d8dd7 100644
(file)
--- a/
src/avr/ao_adc_avr.c
+++ b/
src/avr/ao_adc_avr.c
@@
-17,8
+17,8
@@
#include "ao.h"
#include "ao.h"
-volatile __xdata struct ao_
adc ao_adc_ring[AO_ADC
_RING];
-volatile __data uint8_t ao_
adc
_head;
+volatile __xdata struct ao_
data ao_data_ring[AO_DATA
_RING];
+volatile __data uint8_t ao_
data
_head;
#ifdef TELESCIENCE
const uint8_t adc_channels[AO_LOG_TELESCIENCE_NUM_ADC] = {
#ifdef TELESCIENCE
const uint8_t adc_channels[AO_LOG_TELESCIENCE_NUM_ADC] = {
@@
-92,14
+92,14
@@
ISR(ADC_vect)
/* Must read ADCL first or the value there will be lost */
value = ADCL;
value |= (ADCH << 8);
/* Must read ADCL first or the value there will be lost */
value = ADCL;
value |= (ADCH << 8);
- ao_
adc_ring[ao_adc_head]
.adc[ao_adc_channel] = value;
+ ao_
data_ring[ao_data_head].adc
.adc[ao_adc_channel] = value;
if (++ao_adc_channel < NUM_ADC)
ao_adc_start();
else {
ADCSRA = ADCSRA_INIT;
if (++ao_adc_channel < NUM_ADC)
ao_adc_start();
else {
ADCSRA = ADCSRA_INIT;
- ao_
adc_ring[ao_adc
_head].tick = ao_time();
- ao_
adc_head = ao_adc_ring_next(ao_adc
_head);
- ao_wakeup((void *) &ao_
adc
_head);
+ ao_
data_ring[ao_data
_head].tick = ao_time();
+ ao_
data_head = ao_data_ring_next(ao_data
_head);
+ ao_wakeup((void *) &ao_
data
_head);
ao_cpu_sleep_disable = 0;
}
}
ao_cpu_sleep_disable = 0;
}
}
@@
-113,18
+113,19
@@
ao_adc_poll(void)
}
void
}
void
-ao_
adc_get(__xdata struct ao_adc
*packet)
+ao_
data_get(__xdata struct ao_data
*packet)
{
{
- uint8_t i = ao_
adc_ring_prev(ao_adc
_head);
- memcpy(packet, (void *) &ao_
adc_ring[i], sizeof (struct ao_adc
));
+ uint8_t i = ao_
data_ring_prev(ao_data
_head);
+ memcpy(packet, (void *) &ao_
data_ring[i], sizeof (struct ao_data
));
}
static void
ao_adc_dump(void) __reentrant
{
}
static void
ao_adc_dump(void) __reentrant
{
- static __xdata struct ao_
adc
packet;
+ static __xdata struct ao_
data
packet;
uint8_t i;
uint8_t i;
- ao_adc_get(&packet);
+ ao_data_get(&packet);
+#ifdef TELEPYRO
printf("ADMUX: %02x\n", ADMUX);
printf("ADCSRA: %02x\n", ADCSRA);
printf("ADCSRB: %02x\n", ADCSRB);
printf("ADMUX: %02x\n", ADMUX);
printf("ADCSRA: %02x\n", ADCSRA);
printf("ADCSRB: %02x\n", ADCSRB);
@@
-133,11
+134,14
@@
ao_adc_dump(void) __reentrant
printf("PORTF: %02x\n", PORTF);
printf("DDRF: %02x\n", DDRF);
printf("PINF: %02x\n", PINF);
printf("PORTF: %02x\n", PORTF);
printf("DDRF: %02x\n", DDRF);
printf("PINF: %02x\n", PINF);
+#endif
printf("tick: %5u", packet.tick);
for (i = 0; i < NUM_ADC; i++)
printf("tick: %5u", packet.tick);
for (i = 0; i < NUM_ADC; i++)
- printf (" %2d: %5u", i, packet.adc[i]);
+ printf (" %2d: %5u", i, packet.adc.adc[i]);
+ printf("\n");
+#ifdef TELEPYRO
ADMUX = 0x60;
ADCSRB = 0x00;
ADCSRA = 0xc6;
ADMUX = 0x60;
ADCSRB = 0x00;
ADCSRA = 0xc6;
@@
-146,6
+150,7
@@
ao_adc_dump(void) __reentrant
printf ("ADCL: %02x\n", ADCL);
printf ("ADCH: %02x\n", ADCH);
printf ("\n");
printf ("ADCL: %02x\n", ADCL);
printf ("ADCH: %02x\n", ADCH);
printf ("\n");
+#endif
}
__code struct ao_cmds ao_adc_cmds[] = {
}
__code struct ao_cmds ao_adc_cmds[] = {